diff src/w32.c @ 102670:06ca3efb355b

inc/sys/stat.h (struct stat): Change the types of st_uid and st_gid to unsigned. inc/pwd.h (struct passwd): Change the types of pw_uid and pw_gid to unsigned. (getpwuid): Argument is now unsigned. uid_t is now unsigned. ntlib.c (setuid): Argument is now unsigned. (getuid): Return value is now unsigned. (getpwuid): Argument is now unsigned. (fchown): UID and GID arguments are now unsigned. ntlib.h (fchown): UID and GID arguments are now unsigned. (getuid): Return value is now unsigned. (setuid): Argument is now unsigned. (getpwuid): Remove prototype (it's declared in nt/inc/pwd.h). w32.c (getpwuid): Change argument type to unsigned. (struct w32_id): Change type of `rid' member to unsigned. (w32_cached_id, w32_add_to_cache, get_name_and_id): Change type of argument ID to unsigned. All callers changed. (getuid, geteuid, getgid, getegid): Change return type to unsigned.

--- a/src/w32.c	Sat Mar 21 09:57:30 2009 +0000
+++ b/src/w32.c	Sat Mar 21 11:29:28 2009 +0000
@@ -840,13 +840,13 @@
   0,
 };
 
-int
+unsigned
 getuid ()
 {
   return dflt_passwd.pw_uid;
 }
 
-int
+unsigned
 geteuid ()
 {
   /* I could imagine arguing for checking to see whether the user is
@@ -855,20 +855,20 @@
   return getuid ();
 }
 
-int
+unsigned
 getgid ()
 {
   return dflt_passwd.pw_gid;
 }
 
-int
+unsigned
 getegid ()
 {
   return getgid ();
 }
 
 struct passwd *
-getpwuid (int uid)
+getpwuid (unsigned uid)
 {
   if (uid == dflt_passwd.pw_uid)
     return &dflt_passwd;
@@ -2894,7 +2894,7 @@
 #endif
 
 struct w32_id {
-  int rid;
+  unsigned rid;
   struct w32_id *next;
   char name[GNLEN+1];
   unsigned char sid[FLEXIBLE_ARRAY_MEMBER];
@@ -2903,7 +2903,7 @@
 static struct w32_id *w32_idlist;
 
 static int
-w32_cached_id (PSID sid, int *id, char *name)
+w32_cached_id (PSID sid, unsigned *id, char *name)
 {
   struct w32_id *tail, *found;
 
@@ -2926,7 +2926,7 @@
 }
 
 static void
-w32_add_to_cache (PSID sid, int id, char *name)
+w32_add_to_cache (PSID sid, unsigned id, char *name)
 {
   DWORD sid_len;
   struct w32_id *new_entry;
@@ -2953,7 +2953,7 @@
 
 static int
 get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
-		 int *id, char *nm, int what)
+		 unsigned *id, char *nm, int what)
 {
   PSID sid = NULL;
   char machine[MAX_COMPUTERNAME_LENGTH+1];
@@ -3837,8 +3837,8 @@
   DWORD blen = 0;
   TOKEN_USER user_token;
   TOKEN_PRIMARY_GROUP group_token;
-  int euid;
-  int egid;
+  unsigned euid;
+  unsigned egid;
   DWORD sess;
   PROCESS_MEMORY_COUNTERS mem;
   PROCESS_MEMORY_COUNTERS_EX mem_ex;