Changeset 5586:5b82b3417705 in roaraudio for roard/roard.c

Timestamp:

07/22/12 02:24:07 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

general cleanup for -Wextra

File:

• roard/roard.c (modified) (5 diffs)

roard/roard.c

@@ -909 +909 @@
   if ( *addr == '/' ) {
    if ( grp != NULL || pwd != NULL ) {
-     if ( chown(addr, pwd != NULL ? pwd->pw_uid : -1, grp != NULL ? grp->gr_gid : -1) == -1 )
+     if ( chown(addr, pwd != NULL ? pwd->pw_uid : (uid_t)-1, grp != NULL ? grp->gr_gid : (gid_t)-1) == -1 )
       return -1;
    }
@@ -1242 +1242 @@
 // SLP:
 void register_slp_callback(SLPHandle hslp, SLPError errcode, void * cookie) {
+ (void)hslp;
  /* return the error code in the cookie */
  *(SLPError*)cookie = errcode;
@@ -1374 +1375 @@
   i = 0;
 
-  if ( trust_uid != -1 )
+  if ( trust_uid != (uid_t)-1 )
    key->trust.uids[i++] = trust_uid;
 
@@ -1386 +1387 @@
   i = 0;
 
-  if ( trust_gid != -1 )
+  if ( trust_gid != (gid_t)-1 )
    key->trust.gids[i++] = trust_gid;
 
@@ -2605 +2606 @@
 #if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX)
   if ( pwd != NULL || grp != NULL ) {
-   if ( chown(pidfile, pwd != NULL ? pwd->pw_uid : -1, grp != NULL ? grp->gr_gid : -1) == -1 ) {
+   if ( chown(pidfile, pwd != NULL ? pwd->pw_uid : (uid_t)-1, grp != NULL ? grp->gr_gid : (gid_t)-1) == -1 ) {
     ROAR_WARN("Can not change ownership of pidfile: %s: %s", pidfile, strerror(errno));
    }