Shut up some new aggressively stupid warnings gcc 4.3 produces.
authorRob Landley <rob@landley.net>
Sun, 14 Dec 2008 07:08:37 +0000 (01:08 -0600)
committerRob Landley <rob@landley.net>
Sun, 14 Dec 2008 07:08:37 +0000 (01:08 -0600)
toys/cp.c
toys/mdev.c

index 04c6369..3aaa00f 100644 (file)
--- a/toys/cp.c
+++ b/toys/cp.c
@@ -109,10 +109,10 @@ void cp_file(char *src, char *dst, struct stat *srcst)
        // Can't do fchmod() etc here because -p works on mkdir, too.
 
        if (toys.optflags & FLAG_p) {
-               int mask = umask(0);
+               int mask = umask(0), ignored;
                struct utimbuf ut;
 
-               fchown(fdout,srcst->st_uid, srcst->st_gid);
+               ignored = fchown(fdout,srcst->st_uid, srcst->st_gid);
                ut.actime = srcst->st_atime;
                ut.modtime = srcst->st_mtime;
                utime(dst, &ut);
index 63c5082..39f6635 100644 (file)
@@ -168,7 +168,9 @@ found_device:
        if (mknod(temp, mode | type, makedev(major, minor)) && errno != EEXIST)
                perror_exit("mknod %s failed", temp);
 
-       if (CFG_MDEV_CONF) chown(temp, uid, gid);
+       // Dear gcc: shut up about ignoring the return value here.  If it doesn't
+       // work, what exactly are we supposed to do about it?
+       if (CFG_MDEV_CONF) mode=chown(temp, uid, gid);
 }
 
 static int callback(char *path, struct dirtree *node)