Refactor strchr(p, 0) -> p + strlen(p)

sys/net/iflib.c

@@ -6740,7 +6740,7 @@ mp_ndesc_handler(SYSCTL_HANDLER_ARGS)
 			break;
 		if (i)
 			strcat(buf, ",");
-		sprintf(strchr(buf, 0), "%d", ndesc[i]);
+		sprintf(buf + strlen(buf), "%d", ndesc[i]);
 	}
 
 	rc = sysctl_handle_string(oidp, buf, sizeof(buf), req);

usr.bin/patch/pch.c

@@ -1478,9 +1478,8 @@ do_ed_script(void)
 			if (*t == 's') {
 				for (;;) {
 					continuation = 0;
-					t = strchr(buf, '\0') - 1;
-					while (--t >= buf && *t == '\\')
-						continuation = !continuation;
+					for (t = buf; *t && *t == '\\'; t++)
+						continuation ^= 1;
 					if (!continuation ||
 					    pgets(true) == 0)
 						break;

usr.bin/systat/netstat.c

@@ -541,7 +541,7 @@ inetprint(struct sockaddr *sa, const char *proto)
 		break;
 	}
 	snprintf(line, sizeof(line), "%.*s.", 16, inetname(sa));
-	cp = strchr(line, '\0');
+	cp = line + strlen(line);
 	if (!nflag && port)
 		sp = getservbyport(port, proto);
 	if (sp || port == 0)
@@ -551,7 +551,7 @@ inetprint(struct sockaddr *sa, const char *proto)
 		snprintf(cp, sizeof(line) - (cp - line), "%d",
 		    ntohs((u_short)port));
 	/* pad to full column to clear any garbage */
-	cp = strchr(line, '\0');
+	cp = line + strlen(line);
 	while (cp - line < 22)
 		*cp++ = ' ';
 	line[22] = '\0';

usr.sbin/bhyve/pci_passthru.c

@@ -806,7 +806,7 @@ passthru_lookup_pptdev(const char *name, int *bus, int *slot, int *func)
 	 * the driver name.  Walk backwards from the end of the name to
 	 * find the start of the unit.
 	 */
-	cp = strchr(name, '\0');
+	cp = cp + strlen(cp);
 	assert(cp != NULL);
 	while (cp != name && isdigit(cp[-1]))
 		cp--;

usr.sbin/lpr/chkprintcap/skimprintcap.c

@@ -108,7 +108,7 @@ skim_printcap(const char *pcap_fname, int verbosity)
 		if (lastchar != NULL)
 			*lastchar = '\0';
 		else {
-			lastchar = strchr(curline, '\0');
+			lastchar = curline + strlen(lastchar);
 			missing_nl = 1;
 		}
 		if (curline < lastchar)

usr.sbin/lpr/common_source/common.c

@@ -561,8 +561,8 @@ trstat_write(struct printer *pp, tr_sendrecv sendrecv, size_t bytecnt,
 	const char *lprhost, *recvdev, *recvhost, *rectype;
 	const char *sendhost, *statfname;
 #define UPD_EOSTAT(xStr) do {         \
-	eostat = strchr(xStr, '\0');  \
-	remspace = eostat - xStr;     \
+	remspace = strlen(xStr);          \
+	eostat = xStr + remspace;         \
 } while(0)
 
 	lpd_gettime(&pp->tr_done, NULL, (size_t)0);

usr.sbin/pciconf/pciconf.c

@@ -826,9 +826,9 @@ load_vendors(void)
 
 		if ((ch = strchr(buf, '#')) != NULL)
 			*ch = '\0';
-		ch = strchr(buf, '\0') - 1;
+		ch = buf + strlen(buf);
 		while (ch > buf && isspace(*ch))
-			*ch-- = '\0';
+			*--ch = '\0';
 		if (ch <= buf)
 			continue;