[Pkg-shadow-commits] r2301 - in upstream/trunk: . lib
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sat Aug 30 18:32:21 UTC 2008
Author: nekral-guest
Date: 2008-08-30 18:32:19 +0000 (Sat, 30 Aug 2008)
New Revision: 2301
Modified:
upstream/trunk/ChangeLog
upstream/trunk/lib/groupmem.c
upstream/trunk/lib/pwmem.c
upstream/trunk/lib/shadowmem.c
Log:
* 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.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-08-30 18:31:56 UTC (rev 2300)
+++ upstream/trunk/ChangeLog 2008-08-30 18:32:19 UTC (rev 2301)
@@ -1,5 +1,12 @@
2008-08-26 Nicolas François <nicolas.francois at 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 at centraliens.net>
+
* libmisc/mail.c: Added brackets and parenthesis.
* libmisc/mail.c: Avoid assignments in comparisons.
Modified: upstream/trunk/lib/groupmem.c
===================================================================
--- upstream/trunk/lib/groupmem.c 2008-08-30 18:31:56 UTC (rev 2300)
+++ upstream/trunk/lib/groupmem.c 2008-08-30 18:32:19 UTC (rev 2301)
@@ -44,24 +44,34 @@
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;
}
Modified: upstream/trunk/lib/pwmem.c
===================================================================
--- upstream/trunk/lib/pwmem.c 2008-08-30 18:31:56 UTC (rev 2300)
+++ upstream/trunk/lib/pwmem.c 2008-08-30 18:32:19 UTC (rev 2301)
@@ -44,19 +44,32 @@
{
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;
}
Modified: upstream/trunk/lib/shadowmem.c
===================================================================
--- upstream/trunk/lib/shadowmem.c 2008-08-30 18:31:56 UTC (rev 2300)
+++ upstream/trunk/lib/shadowmem.c 2008-08-30 18:32:19 UTC (rev 2301)
@@ -45,13 +45,20 @@
{
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;
}
More information about the Pkg-shadow-commits
mailing list