Date: Sun, 15 Feb 2015 21:47:44 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278820 - head/bin/sh Message-ID: <201502152147.t1FLliho075547@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jilles Date: Sun Feb 15 21:47:43 2015 New Revision: 278820 URL: https://svnweb.freebsd.org/changeset/base/278820 Log: sh: Prefer "" to nullstr where possible. Modified: head/bin/sh/cd.c head/bin/sh/eval.c head/bin/sh/expand.c head/bin/sh/mail.c head/bin/sh/miscbltin.c head/bin/sh/nodetypes head/bin/sh/parser.c head/bin/sh/var.c Modified: head/bin/sh/cd.c ============================================================================== --- head/bin/sh/cd.c Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/cd.c Sun Feb 15 21:47:43 2015 (r278820) @@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) || (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) || (path = bltinlookup("CDPATH", 1)) == NULL) - path = nullstr; + path = ""; while ((p = padvance(&path, dest)) != NULL) { if (stat(p, &statb) < 0) { if (errno != ENOENT) Modified: head/bin/sh/eval.c ============================================================================== --- head/bin/sh/eval.c Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/eval.c Sun Feb 15 21:47:43 2015 (r278820) @@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis struct localvar *savelocalvars; int need_longjmp = 0; - redir->nhere.expdoc = nullstr; + redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; forcelocal++; Modified: head/bin/sh/expand.c ============================================================================== --- head/bin/sh/expand.c Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/expand.c Sun Feb 15 21:47:43 2015 (r278820) @@ -530,8 +530,7 @@ subevalvar(char *p, char *str, int strlo error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " - : nullstr); + str, (varflags & VSNUL) ? "null or " : ""); return 0; case VSTRIMLEFT: Modified: head/bin/sh/mail.c ============================================================================== --- head/bin/sh/mail.c Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/mail.c Sun Feb 15 21:47:43 2015 (r278820) @@ -85,7 +85,7 @@ chkmail(int silent) setstackmark(&smark); mpath = mpathset()? mpathval() : mailval(); for (i = 0 ; i < nmboxes ; i++) { - p = padvance(&mpath, nullstr); + p = padvance(&mpath, ""); if (p == NULL) break; if (*p == '\0') Modified: head/bin/sh/miscbltin.c ============================================================================== --- head/bin/sh/miscbltin.c Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/miscbltin.c Sun Feb 15 21:47:43 2015 (r278820) @@ -265,7 +265,7 @@ readcmd(int argc __unused, char **argv _ /* Set any remaining args to "" */ while (*++ap != NULL) - setvar(*ap, nullstr, 0); + setvar(*ap, "", 0); return status; } Modified: head/bin/sh/nodetypes ============================================================================== --- head/bin/sh/nodetypes Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/nodetypes Sun Feb 15 21:47:43 2015 (r278820) @@ -138,7 +138,7 @@ NXHERE nhere # fd<<! fd int # file descriptor being redirected next nodeptr # next redirection in list doc nodeptr # input to command (NARG node) - expdoc temp char *expdoc # actual document (for NXHERE) + expdoc temp const char *expdoc # actual document (for NXHERE) NNOT nnot # ! command (actually pipeline) type int Modified: head/bin/sh/parser.c ============================================================================== --- head/bin/sh/parser.c Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/parser.c Sun Feb 15 21:47:43 2015 (r278820) @@ -1940,7 +1940,7 @@ getprompt(void *unused __unused) */ switch (whichprompt) { case 0: - fmt = nullstr; + fmt = ""; break; case 1: fmt = ps1val(); Modified: head/bin/sh/var.c ============================================================================== --- head/bin/sh/var.c Sun Feb 15 21:42:10 2015 (r278819) +++ head/bin/sh/var.c Sun Feb 15 21:47:43 2015 (r278820) @@ -872,7 +872,7 @@ unsetvar(const char *s) if (vp->flags & VREADONLY) return (1); if (vp->text[vp->name_len + 1] != '\0') - setvar(s, nullstr, 0); + setvar(s, "", 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { change_env(s, 0); setlocale(LC_ALL, "");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502152147.t1FLliho075547>