Author: ngie
Date: Sat Dec 3 19:15:26 2016
New Revision: 309505
URL: https://svnweb.freebsd.org/changeset/base/309505
Log:
MFC r298183,r304226:
r298183 (by araujo):
Use NULL for pointers.
strrchr(3) will return NULL if the character does not appears in
the string.
r304226 (by araujo):
Use nitems() from sys/param.h.
Modified:
stable/10/usr.bin/rpcgen/rpc_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/rpcgen/rpc_main.c
==============================================================================
--- stable/10/usr.bin/rpcgen/rpc_main.c Sat Dec 3 19:03:40 2016
(r309504)
+++ stable/10/usr.bin/rpcgen/rpc_main.c Sat Dec 3 19:15:26 2016
(r309505)
@@ -82,11 +82,11 @@ static char pathbuf[MAXPATHLEN + 1];
static const char *allv[] = {
"rpcgen", "-s", "udp", "-s", "tcp",
};
-static int allc = sizeof (allv)/sizeof (allv[0]);
+static int allc = nitems(allv);
static const char *allnv[] = {
"rpcgen", "-s", "netpath",
};
-static int allnc = sizeof (allnv)/sizeof (allnv[0]);
+static int allnc = nitems(allnv);
/*
* machinations for handling expanding argument list
@@ -451,7 +451,7 @@ generate_guard(const char *pathname)
char *guard, *tmp, *stopat;
filename = strrchr(pathname, '/'); /* find last component */
- filename = ((filename == 0) ? pathname : filename+1);
+ filename = ((filename == NULL) ? pathname : filename+1);
guard = xstrdup(filename);
stopat = strrchr(guard, '.');
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
