* 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.
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user