Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Fix fallout from libsa change; stand.h includes <sy...



details:   https://anonhg.NetBSD.org/src/rev/d745b7b58d6f
branches:  trunk
changeset: 365870:d745b7b58d6f
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Apr 30 03:37:09 2022 +0000

description:
Fix fallout from libsa change; stand.h includes <sys/param.h> now.

Use '\0' instead of NULL for NUL-character.

diffstat:

 sys/arch/landisk/stand/boot/boot2.c |  6 +++---
 sys/arch/prep/stand/boot/devopen.c  |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 1f1a45c282fc -r d745b7b58d6f sys/arch/landisk/stand/boot/boot2.c
--- a/sys/arch/landisk/stand/boot/boot2.c       Fri Apr 29 22:44:44 2022 +0000
+++ b/sys/arch/landisk/stand/boot/boot2.c       Sat Apr 30 03:37:09 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot2.c,v 1.6 2016/06/11 06:31:49 dholland Exp $       */
+/*     $NetBSD: boot2.c,v 1.7 2022/04/30 03:37:09 rin Exp $    */
 
 /*
  * Copyright (c) 2003
@@ -479,7 +479,7 @@
        *howto = 0;
 
        /* if there were no arguments */
-       if (*arg == NULL)
+       if (*arg == '\0')
                return (1);
 
        /* format is... */
@@ -493,7 +493,7 @@
                *filename = arg;
 
                opts = gettrailer(arg);
-               if (*opts == NULL) {
+               if (*opts == '\0') {
                        opts = NULL;
                } else if (*opts != '-') {
                        printf("invalid arguments\n");
diff -r 1f1a45c282fc -r d745b7b58d6f sys/arch/prep/stand/boot/devopen.c
--- a/sys/arch/prep/stand/boot/devopen.c        Fri Apr 29 22:44:44 2022 +0000
+++ b/sys/arch/prep/stand/boot/devopen.c        Sat Apr 30 03:37:09 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: devopen.c,v 1.5 2014/08/10 07:40:49 isaki Exp $        */
+/*     $NetBSD: devopen.c,v 1.6 2022/04/30 03:41:05 rin Exp $  */
 
 /*-
  *  Copyright (c) 1993 John Brezak
@@ -73,7 +73,7 @@
 
        if (*s == '(') {
                /* lookup device and get index */
-               *s = NULL;
+               *s = '\0';
                if ((*dev = devlookup(nametmp)) < 0)
                    goto baddev;
 
@@ -86,13 +86,13 @@
                                }
                        } else {
                                if (flag) {
-                                       *s = NULL;
+                                       *s = '\0';
                                        flag = 0;
                                }
                        }
                }
                if (*s == ')')
-                       *s = NULL;
+                       *s = '\0';
 
                switch (argc) {
                case 3:



Home | Main Index | Thread Index | Old Index