summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2003-11-26 00:33:59 +0000
committerMarc Espie <espie@cvs.openbsd.org>2003-11-26 00:33:59 +0000
commit0509ed2706dbc025ca31c88df49afd2463567d00 (patch)
tree01f0bbbd3331e28e9ae0a08c92758a35fb3e0ff6 /usr.bin
parent595ebe7f0f6fe2ad870138ac707b3498af006c46 (diff)
This is ISO C, use string concatenation, instead of bogus use of __CONCAT.
(hint: "a" and "b" can't be pasted as a valid C token...) okay millert@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/chpass/chpass.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 41b3c760500..56f13c4de5e 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chpass.c,v 1.28 2003/07/01 01:01:28 avsm Exp $ */
+/* $OpenBSD: chpass.c,v 1.29 2003/11/26 00:33:58 espie Exp $ */
/* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */
/*-
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: chpass.c,v 1.28 2003/07/01 01:01:28 avsm Exp $";
+static char rcsid[] = "$OpenBSD: chpass.c,v 1.29 2003/11/26 00:33:58 espie Exp $";
#endif
#endif /* not lint */
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
/* Edit the user passwd information if requested. */
if (op == EDITENTRY) {
- char tempname[] = __CONCAT(_PATH_VARTMP,"pw.XXXXXXXXXX");
+ char tempname[] = _PATH_VARTMP "pw.XXXXXXXXXX";
int edit_status;
dfd = mkstemp(tempname);