silence compiler warnings

Signed-off-by: Serge Hallyn <shallyn@cisco.com>

diff --git a/libmisc/btrfs.c b/libmisc/btrfs.c
index cae93476ceb33e41c6b67e03d6571e934c5470d8..d23da5eb26f8d7e5e2e09f42a682c4efd891d7bf 100644 (file)
--- a/libmisc/btrfs.c
+++ b/libmisc/btrfs.c
@@ -7,7 +7,6 @@
 
 static bool path_exists(const char *p)
 {
-       int ret;
        struct stat sb;
 
        return stat(p, &sb) == 0;

diff --git a/libmisc/prefix_flag.c b/libmisc/prefix_flag.c
index 4fe6d195f356a50528dd94b2e35c0bf99c0f7a03..d72f7e394f379354d07ebbb24d33e3c92f4d4d6e 100644 (file)
--- a/libmisc/prefix_flag.c
+++ b/libmisc/prefix_flag.c
@@ -166,7 +166,7 @@ extern struct group *prefix_getgrnam(const char *name)
                fg = fopen(group_db_file, "rt");
                if(!fg)
                        return NULL;
-               while(grp = fgetgrent(fg)) {
+               while((grp = fgetgrent(fg)) != NULL) {
                        if(!strcmp(name, grp->gr_name))
                                break;
                }
@@ -186,7 +186,7 @@ extern struct group *prefix_getgrgid(gid_t gid)
                fg = fopen(group_db_file, "rt");
                if(!fg)
                        return NULL;
-               while(grp = fgetgrent(fg)) {
+               while((grp = fgetgrent(fg)) != NULL) {
                        if(gid == grp->gr_gid)
                                break;
                }
@@ -206,7 +206,7 @@ extern struct passwd *prefix_getpwuid(uid_t uid)
                fg = fopen(passwd_db_file, "rt");
                if(!fg)
                        return NULL;
-               while(pwd = fgetpwent(fg)) {
+               while((pwd = fgetpwent(fg)) != NULL) {
                        if(uid == pwd->pw_uid)
                                break;
                }
@@ -226,7 +226,7 @@ extern struct passwd *prefix_getpwnam(const char* name)
                fg = fopen(passwd_db_file, "rt");
                if(!fg)
                        return NULL;
-               while(pwd = fgetpwent(fg)) {
+               while((pwd = fgetpwent(fg)) != NULL) {
                        if(!strcmp(name, pwd->pw_name))
                                break;
                }
@@ -246,7 +246,7 @@ extern struct spwd *prefix_getspnam(const char* name)
                fg = fopen(spw_db_file, "rt");
                if(!fg)
                        return NULL;
-               while(sp = fgetspent(fg)) {
+               while((sp = fgetspent(fg)) != NULL) {
                        if(!strcmp(name, sp->sp_namp))
                                break;
                }