* sec_acl.cc (getacl): Avoid compiler warning.

* security.cc (write_sd): Ditto. Fix error handling.
2004-04-14 20:16:29 +00:00
parent 0c5f00f98a
commit a653f600f5
3 changed files with 16 additions and 10 deletions
--- a/winsup/cygwin/sec_acl.cc
+++ b/winsup/cygwin/sec_acl.cc
@@ -261,12 +261,11 @@ getacl (HANDLE handle, const char *file, DWORD attr, int nentries,
 {
  security_descriptor sd;

-  int ret;
  if (!handle || get_nt_object_security (handle, SE_FILE_OBJECT, sd)
-      && (ret = read_sd (file, sd)) <= 0)
+      && read_sd (file, sd) <= 0)
    {
      debug_printf ("read_sd %E");
-      return ret;
+      return -1;
    }

  cygpsid owner_sid;