diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2002-08-12 00:42:57 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2002-08-12 00:42:57 +0000 |
| commit | 87ffdf06b6ecc46b38ca953419304b64e37c7c95 (patch) | |
| tree | 9e44c0b5a073ee17b9d7d3da181c696f012c6248 /usr.bin/mail | |
| parent | 941ec3d1051d178a11f6baa72a3d520413033f2e (diff) | |
Swap args to calloc(3) so they are in the correct order; art@ ok.
Diffstat (limited to 'usr.bin/mail')
| -rw-r--r-- | usr.bin/mail/cmd3.c | 8 | ||||
| -rw-r--r-- | usr.bin/mail/vars.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c index bddc3c8e66f..a8ecb29d24c 100644 --- a/usr.bin/mail/cmd3.c +++ b/usr.bin/mail/cmd3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd3.c,v 1.18 2001/11/21 20:41:55 millert Exp $ */ +/* $OpenBSD: cmd3.c,v 1.19 2002/08/12 00:42:56 aaron Exp $ */ /* $NetBSD: cmd3.c,v 1.8 1997/07/09 05:29:49 mikel Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)cmd3.c 8.2 (Berkeley) 4/20/95"; #else -static const char rcsid[] = "$OpenBSD: cmd3.c,v 1.18 2001/11/21 20:41:55 millert Exp $"; +static const char rcsid[] = "$OpenBSD: cmd3.c,v 1.19 2002/08/12 00:42:56 aaron Exp $"; #endif #endif /* not lint */ @@ -491,7 +491,7 @@ group(void *v) gname = *argv; h = hash(gname); if ((gh = findgroup(gname)) == NULL) { - if ((gh = (struct grouphead *)calloc(sizeof(*gh), 1)) == NULL) + if ((gh = (struct grouphead *)calloc(1, sizeof(*gh))) == NULL) errx(1, "Out of memory"); gh->g_name = vcopy(gname); gh->g_list = NULL; @@ -506,7 +506,7 @@ group(void *v) */ for (ap = argv+1; *ap != NULL; ap++) { - if ((gp = (struct group *)calloc(sizeof(*gp), 1)) == NULL) + if ((gp = (struct group *)calloc(1, sizeof(*gp))) == NULL) errx(1, "Out of memory"); gp->ge_name = vcopy(*ap); gp->ge_link = gh->g_list; diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c index e79ceda8099..9237583df1e 100644 --- a/usr.bin/mail/vars.c +++ b/usr.bin/mail/vars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vars.c,v 1.8 2001/11/21 20:41:56 millert Exp $ */ +/* $OpenBSD: vars.c,v 1.9 2002/08/12 00:42:56 aaron Exp $ */ /* $NetBSD: vars.c,v 1.4 1996/06/08 19:48:45 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: vars.c,v 1.8 2001/11/21 20:41:56 millert Exp $"; +static const char rcsid[] = "$OpenBSD: vars.c,v 1.9 2002/08/12 00:42:56 aaron Exp $"; #endif #endif /* not lint */ @@ -63,7 +63,7 @@ assign(char *name, char *value) h = hash(name); vp = lookup(name); if (vp == NULL) { - if ((vp = (struct var *)calloc(sizeof(*vp), 1)) == NULL) + if ((vp = (struct var *)calloc(1, sizeof(*vp))) == NULL) errx(1, "Out of memory"); vp->v_name = vcopy(name); vp->v_link = variables[h]; |