* lib/groupmem.c, lib/pwmem.c, lib/shadowmem.c: Added brackets and

	parenthesis.
	* lib/groupmem.c, lib/pwmem.c, lib/shadowmem.c: Avoid assignments
	in comparisons.

diff --git a/ChangeLog b/ChangeLog
index 19fbcbc7c08049225a2d3e1f568ca90484b2db5d..eb9c80a34df48dcc846bf61b165d78f2e7d1a9f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-26  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * lib/groupmem.c, lib/pwmem.c, lib/shadowmem.c: Added brackets and
+       parenthesis.
+       * lib/groupmem.c, lib/pwmem.c, lib/shadowmem.c: Avoid assignments
+       in comparisons.
+
 2008-08-26  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/mail.c: Added brackets and parenthesis.

diff --git a/lib/groupmem.c b/lib/groupmem.c
index dd2add841d0caa23eba44183e96890fc643c3170..6bdcfd107cf5e588cf09ebf1ba127d8fefa838ea 100644 (file)
--- a/lib/groupmem.c
+++ b/lib/groupmem.c
@@ -44,24 +44,34 @@ struct group *__gr_dup (const struct group *grent)
        struct group *gr;
        int i;
 
-       if (!(gr = (struct group *) malloc (sizeof *gr)))
+       gr = (struct group *) malloc (sizeof *gr);
+       if (NULL == gr) {
                return NULL;
+       }
        *gr = *grent;
-       if (!(gr->gr_name = strdup (grent->gr_name)))
+       gr->gr_name = strdup (grent->gr_name);
+       if (NULL == gr->gr_name) {
                return NULL;
-       if (!(gr->gr_passwd = strdup (grent->gr_passwd)))
+       }
+       gr->gr_passwd = strdup (grent->gr_passwd);
+       if (NULL == gr->gr_passwd) {
                return NULL;
+       }
 
        for (i = 0; grent->gr_mem[i]; i++);
+
        gr->gr_mem = (char **) malloc ((i + 1) * sizeof (char *));
-       if (!gr->gr_mem)
+       if (NULL == gr->gr_mem) {
                return NULL;
+       }
        for (i = 0; grent->gr_mem[i]; i++) {
                gr->gr_mem[i] = strdup (grent->gr_mem[i]);
-               if (!gr->gr_mem[i])
+               if (NULL == gr->gr_mem[i]) {
                        return NULL;
+               }
        }
        gr->gr_mem[i] = NULL;
+
        return gr;
 }
 

diff --git a/lib/pwmem.c b/lib/pwmem.c
index 84dee3d5450ac30aebbe13e8ffd74dea664a6b4c..addd0fba96c97ee90016ecd7693136120ddd25ff 100644 (file)
--- a/lib/pwmem.c
+++ b/lib/pwmem.c
@@ -44,19 +44,32 @@ struct passwd *__pw_dup (const struct passwd *pwent)
 {
        struct passwd *pw;
 
-       if (!(pw = (struct passwd *) malloc (sizeof *pw)))
+       pw = (struct passwd *) malloc (sizeof *pw);
+       if (NULL == pw) {
                return NULL;
+       }
        *pw = *pwent;
-       if (!(pw->pw_name = strdup (pwent->pw_name)))
+       pw->pw_name = strdup (pwent->pw_name);
+       if (NULL == pw->pw_name) {
                return NULL;
-       if (!(pw->pw_passwd = strdup (pwent->pw_passwd)))
+       }
+       pw->pw_passwd = strdup (pwent->pw_passwd);
+       if (NULL == pw->pw_passwd) {
                return NULL;
-       if (!(pw->pw_gecos = strdup (pwent->pw_gecos)))
+       }
+       pw->pw_gecos = strdup (pwent->pw_gecos);
+       if (NULL == pw->pw_gecos) {
                return NULL;
-       if (!(pw->pw_dir = strdup (pwent->pw_dir)))
+       }
+       pw->pw_dir = strdup (pwent->pw_dir);
+       if (NULL == pw->pw_dir) {
                return NULL;
-       if (!(pw->pw_shell = strdup (pwent->pw_shell)))
+       }
+       pw->pw_shell = strdup (pwent->pw_shell);
+       if (NULL == pw->pw_shell) {
                return NULL;
+       }
+
        return pw;
 }
 

diff --git a/lib/shadowmem.c b/lib/shadowmem.c
index b3443bfc2c30a41299c5097fca78375bb25a0a40..d27fde747174a7f0a6a52260b0ab3dd9113c8ecd 100644 (file)
--- a/lib/shadowmem.c
+++ b/lib/shadowmem.c
@@ -45,13 +45,20 @@ struct spwd *__spw_dup (const struct spwd *spent)
 {
        struct spwd *sp;
 
-       if (!(sp = (struct spwd *) malloc (sizeof *sp)))
+       sp = (struct spwd *) malloc (sizeof *sp);
+       if (NULL == sp) {
                return NULL;
+       }
        *sp = *spent;
-       if (!(sp->sp_namp = strdup (spent->sp_namp)))
+       sp->sp_namp = strdup (spent->sp_namp);
+       if (NULL == sp->sp_namp) {
                return NULL;
-       if (!(sp->sp_pwdp = strdup (spent->sp_pwdp)))
+       }
+       sp->sp_pwdp = strdup (spent->sp_pwdp);
+       if (NULL == sp->sp_pwdp) {
                return NULL;
+       }
+
        return sp;
 }