 @@ -1,14 +1,14 @@
-/* $NetBSD: lex.c,v 1.33 2019/01/05 16:54:00 christos Exp $ */
+/* $NetBSD: lex.c,v 1.34 2019/02/01 08:29:03 mrg Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)lex.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lex.c,v 1.33 2019/01/05 16:54:00 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.34 2019/02/01 08:29:03 mrg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 @@ -1313,50 +1313,50 @@ top:
 	if ((c = *alvecp++) != '\0')
 	    return (c);
 	if (alvec && *alvec) {
 		alvecp = *alvec++;
 		return (' ');
+	}
 	else {
 	    aret = F_SEEK;
 	    alvecp = NULL;
 	    return('\n');
+	}
+    }
     if (alvec) {
-	if ((alvecp = *alvec) != '\0') {
+	if ((alvecp = *alvec) != NULL) {
 	    alvec++;
 	    goto top;
+	}
 	/* Infinite source! */
 	return ('\n');
+    }
     if (evalp) {
 	aret = E_SEEK;
 	if ((c = *evalp++) != '\0')
 	    return (c);
 	if (evalvec && *evalvec) {
 	    evalp = *evalvec++;
 	    return (' ');
+	}
 	aret = F_SEEK;
 	evalp = 0;
+    }
     if (evalvec) {
 	if (evalvec == (Char **) 1) {
 	    doneinp = 1;
 	    reset();
+	}
-	if ((evalp = *evalvec) != '\0') {
+	if ((evalp = *evalvec) != NULL) {
 	    evalvec++;
 	    goto top;
+	}
 	evalvec = (Char **) 1;
 	return ('\n');
+    }
     do {
 	if (arginp == (Char *) 1 || onelflg == 1) {
 	    if (wanteof)
 		return (-1);
 	    exitstat();
+	}
 	if (arginp) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: options.c,v 1.4 2014/10/25 21:11:37 christos Exp $	*/
+/*	$NetBSD: options.c,v 1.5 2019/02/01 08:29:04 mrg Exp $	*/
 /*
  * options.c - handles option processing for PPP.
+ *
  * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
 @@ -37,27 +37,27 @@
  * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
  * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
 #if 0
 #define RCSID	"Id: options.c,v 1.102 2008/06/15 06:53:06 paulus Exp "
 static const char rcsid[] = RCSID;
 #else
-__RCSID("$NetBSD: options.c,v 1.4 2014/10/25 21:11:37 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.5 2019/02/01 08:29:04 mrg Exp $");
 #endif
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <string.h>
 #include <pwd.h>
 #ifdef PLUGIN
 #include <dlfcn.h>
 @@ -1777,27 +1777,27 @@ user_setprint(opt, printer, arg)
+}
 static int
 user_unsetenv(argv)
     char **argv;
+{
     struct userenv *uep, **insp;
     char *arg = argv[0];
     if (strchr(arg, '=') != NULL) {
 	option_error("unexpected = in name: %s", arg);
 	return 0;
+    }
-    if (arg == '\0') {
+    if (arg == NULL) {
 	option_error("missing variable name for unset");
 	return 0;
+    }
     for (uep = userenv_list; uep != NULL; uep = uep->ue_next) {
 	if (strcmp(arg, uep->ue_name) == 0)
 	    break;
+    }
     /* Ignore attempts by unprivileged users to override privileged sources */
     if (uep != NULL && !privileged_option && uep->ue_priv)
 	return 1;
     /* The name never changes, so allocate it with the structure */
     if (uep == NULL) {
 	uep = malloc(sizeof (*uep) + strlen(arg));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: basename.c,v 1.15 2011/08/29 14:24:03 joerg Exp $	*/
+/*	$NetBSD: basename.c,v 1.16 2019/02/01 08:29:04 mrg Exp $	*/
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
 #endif
-__RCSID("$NetBSD: basename.c,v 1.15 2011/08/29 14:24:03 joerg Exp $");
+__RCSID("$NetBSD: basename.c,v 1.16 2019/02/01 08:29:04 mrg Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <libgen.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 __dead static void usage(void);
 int
 @@ -68,27 +68,27 @@ main(int argc, char **argv)
+		}
 	argc -= optind;
 	argv += optind;
 	if (argc != 1 && argc != 2)
 		usage();
 	if (**argv == '\0') {
 		(void)printf("\n");
 		exit(0);
+	}
 	if ((p = basename(*argv)) == NULL)
 		err(1, "%s", *argv);
-	if (*++argv != '\0') {
+	if (*++argv != NULL) {
 		int suffixlen, stringlen, off;
 		suffixlen = strlen(*argv);
 		stringlen = strlen(p);
 		if (suffixlen < stringlen) {
 			off = stringlen - suffixlen;
 			if (strcmp(p + off, *argv) == 0)
 				p[off] = '\0';
+		}
+	}
 	(void)printf("%s\n", p);
 	exit(0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gcore.c,v 1.11 2008/04/28 20:24:13 martin Exp $	*/
+/*	$NetBSD: gcore.c,v 1.12 2019/02/01 08:29:04 mrg Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: gcore.c,v 1.11 2008/04/28 20:24:13 martin Exp $");
+__RCSID("$NetBSD: gcore.c,v 1.12 2019/02/01 08:29:04 mrg Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/ptrace.h>
 #include <sys/proc.h>
 #include <sys/wait.h>
 #include <stdio.h>
 #include <string.h>
 #include <err.h>
 #include <limits.h>
 #include <stdlib.h>
 @@ -78,27 +78,27 @@ main(int argc, char **argv)
+		}
 	if (optind == argc)
 		usage();
 	for (c = optind; c < argc; c++) {
 		char *ep;
 		u_long lval;
 		int status, serrno;
 		pid_t pid, cpid;
 		errno = 0;
 		lval = strtoul(argv[c], &ep, 0);
-		if (argv[c] == '\0' || *ep)
+		if (argv[c] == NULL || *ep)
 			errx(1, "`%s' is not a number.", argv[c]);
 		if (errno == ERANGE && lval == ULONG_MAX)
 			err(1, "Pid `%s'", argv[c]);
 		pid = (pid_t)lval;
 		if (ptrace(PT_ATTACH, pid, 0, 0) == -1)
 			err(1, "ptrace(PT_ATTACH) to %lu failed", lval);
 		if ((cpid = waitpid(pid, &status, 0)) != pid) {
 			serrno = errno;
 			(void)ptrace(PT_DETACH, pid, (void *)1, 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mime_attach.c,v 1.19 2017/11/09 20:27:50 christos Exp $	*/
+/*	$NetBSD: mime_attach.c,v 1.20 2019/02/01 08:29:04 mrg Exp $	*/
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Anon Ymous.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,27 +23,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef MIME_SUPPORT
 #include <sys/cdefs.h>
 #ifndef __lint__
-__RCSID("$NetBSD: mime_attach.c,v 1.19 2017/11/09 20:27:50 christos Exp $");
+__RCSID("$NetBSD: mime_attach.c,v 1.20 2019/02/01 08:29:04 mrg Exp $");
 #endif /* not __lint__ */
 #include <assert.h>
 #include <err.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <magic.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 @@ -1008,27 +1008,27 @@ mime_attach_optargs(struct name *optargs
 	expand_optargs = value(ENAME_MIME_ATTACH_LIST);
 	attach_num = 1;
 	ap = NULL;
 	attach = NULL;
 	for (np = optargs; np; np = np->n_flink) {
 		char *argv[MAXARGC];
 		int argc;
 		int i;
 		if (expand_optargs != NULL)
 			argc = getrawlist(np->n_name,
 			    argv, (int)__arraycount(argv));
 		else {
-			if (np->n_name == '\0')
+			if (np->n_name == NULL)
 				argc = 0;
 			else {
 				argc = 1;
 				argv[0] = np->n_name;
+			}
 			argv[argc] = NULL;/* be consistent with getrawlist() */
+		}
 		for (i = 0; i < argc; i++) {
 			struct attachment *ap2;
 			char *filename;
 			if (argv[i][0] == '/')	/* an absolute path */
 				(void)easprintf(&filename, "%s", argv[i]);

 @@ -1,14 +1,14 @@
-/* $NetBSD: tabs.c,v 1.4 2011/09/16 15:39:29 joerg Exp $ */
+/* $NetBSD: tabs.c,v 1.5 2019/02/01 08:29:04 mrg Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roy Marples.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,27 +23,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 2008 \
 The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: tabs.c,v 1.4 2011/09/16 15:39:29 joerg Exp $");
+__RCSID("$NetBSD: tabs.c,v 1.5 2019/02/01 08:29:04 mrg Exp $");
 #endif /* not lint */
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <term.h>
 #include <unistd.h>
 @@ -102,27 +102,27 @@ main(int argc, char **argv)
 					errx(EXIT_FAILURE,
 					     "%s: invalid margin", arg);
+			}
 			continue;
+		}
 		if (argv[i][0] != '-') {
 			tabs = argv[i];
 			break;
+		}
 		arg = argv[i] + 1;
 		if (arg[0] == '\0')
 			usage();
 		if (arg[0] == '-' && arg[1] == '\0') {
-			if (argv[i + 1] != '\0')
+			if (argv[i + 1] != NULL)
 				tabs = argv[i + 1];
 			break;
+		}
 		if (arg[0] == 'T' && arg[1] == '\0') {
 			term = argv[++i];
 			if (term == NULL)
 				usage();
 			continue;
+		}
 		if (isdigit((int)arg[0])) {
 			if (arg[1] != '\0')
 				errx(EXIT_FAILURE,
 				     "%s: invalid increament", arg);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acu.c,v 1.16 2011/09/06 18:33:01 joerg Exp $	*/
+/*	$NetBSD: acu.c,v 1.17 2019/02/01 08:29:04 mrg Exp $	*/
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: acu.c,v 1.16 2011/09/06 18:33:01 joerg Exp $");
+__RCSID("$NetBSD: acu.c,v 1.17 2019/02/01 08:29:04 mrg Exp $");
 #endif /* not lint */
 #include "tip.h"
 static acu_t *acu = NULL;
 static int conflag;
 static jmp_buf jmpbuf;
 __dead static void	acuabort(int);
 static acu_t   *acutype(char *);
 /*
  * Establish connection for tip
 @@ -173,18 +173,18 @@ disconnect(const char *reason)
 static void
 acuabort(int s)
+{
 	(void)signal(s, SIG_IGN);
 	longjmp(jmpbuf, 1);
+}
 static acu_t *
 acutype(char *s)
+{
 	acu_t *p;
-	for (p = acutable; p->acu_name != '\0'; p++)
+	for (p = acutable; p->acu_name != NULL; p++)
 		if (!strcmp(s, p->acu_name))
 			return (p);
 	return (NULL);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fwcontrol.c,v 1.16 2011/10/17 16:50:47 mbalmer Exp $	*/
+/*	$NetBSD: fwcontrol.c,v 1.17 2019/02/01 08:29:04 mrg Exp $	*/
 /*
  * Copyright (C) 2002
  * 	Hidetoshi Shimokawa. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -24,27 +24,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 //__FBSDID("$FreeBSD: src/usr.sbin/fwcontrol/fwcontrol.c,v 1.23 2006/10/26 22:33:38 imp Exp $");
-__RCSID("$NetBSD: fwcontrol.c,v 1.16 2011/10/17 16:50:47 mbalmer Exp $");
+__RCSID("$NetBSD: fwcontrol.c,v 1.17 2019/02/01 08:29:04 mrg Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include "eui64.h"
 #include <dev/ieee1394/firewire.h>
 #include <dev/ieee1394/iec13213.h>
 #include <dev/ieee1394/fwphyreg.h>
 #include <dev/ieee1394/iec68113.h>
 @@ -107,27 +107,27 @@ get_dev(int fd, struct fw_devlstreq *dat
 	if (ioctl(fd, FW_GDEVLST, data) < 0)
 		err(EX_IOERR, "%s: ioctl", __func__);
+}
 static int
 str2node(int fd, const char *nodestr)
+{
 	struct eui64 eui, tmpeui;
 	struct fw_devlstreq *data;
 	char *endptr;
 	int i;
 	long node;
-	if (nodestr == '\0')
+	if (nodestr == NULL)
 		return -1;
 	/*
 	 * Deal with classic node specifications.
 	 */
 	node = strtol(nodestr, &endptr, 0);
 	if (*endptr == '\0')
 		goto gotnode;
 	/*
 	 * Try to get an eui and match it against available nodes.
 	 */
 	if (eui64_hostton(nodestr, &eui) != 0 && eui64_aton(nodestr, &eui) != 0)