* 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:
nekral-guest
2008-08-30 18:32:19 +00:00
parent cf4aea18b4
commit 7109072b8f
4 changed files with 51 additions and 14 deletions

View File

@ -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;
}