Module Name: src
Committed By: christos
Date: Wed Dec 7 02:48:54 UTC 2016
Modified Files:
src/lib/libc/net: linkaddr.c
Log Message:
Add the terminating NUL as a regular character addition.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/net/linkaddr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/linkaddr.c
diff -u src/lib/libc/net/linkaddr.c:1.18 src/lib/libc/net/linkaddr.c:1.19
--- src/lib/libc/net/linkaddr.c:1.18 Tue Dec 6 21:36:41 2016
+++ src/lib/libc/net/linkaddr.c Tue Dec 6 21:48:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linkaddr.c,v 1.18 2016/12/07 02:36:41 dholland Exp $ */
+/* $NetBSD: linkaddr.c,v 1.19 2016/12/07 02:48:54 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: linkaddr.c,v 1.18 2016/12/07 02:36:41 dholland Exp $");
+__RCSID("$NetBSD: linkaddr.c,v 1.19 2016/12/07 02:48:54 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -148,7 +148,7 @@ link_ntoa(const struct sockaddr_dl *sdl)
#define ADDC(ch) \
do { \
- if (out >= obuf + sizeof(obuf) - 1) \
+ if (out >= obuf + sizeof(obuf)) \
return NULL; \
*out++ = (ch); \
} while (/*CONSTCOND*/0)
@@ -175,6 +175,6 @@ link_ntoa(const struct sockaddr_dl *sdl)
} else
ADDC(hexlist[i]);
}
- *out = 0;
+ ADDC('\0');
return (obuf);
}
