Date: Mon, 18 Apr 2016 05:26:32 +0000 (UTC) From: Marcelo Araujo <araujo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298181 - head/usr.bin/login Message-ID: <201604180526.u3I5QWSN021426@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: araujo Date: Mon Apr 18 05:26:32 2016 New Revision: 298181 URL: https://svnweb.freebsd.org/changeset/base/298181 Log: Use NULL instead of 0. strtok(3) will return NULL when no more tokens remain. MFC after: 2 weeks. Modified: head/usr.bin/login/login_fbtab.c Modified: head/usr.bin/login/login_fbtab.c ============================================================================== --- head/usr.bin/login/login_fbtab.c Mon Apr 18 05:19:45 2016 (r298180) +++ head/usr.bin/login/login_fbtab.c Mon Apr 18 05:26:32 2016 (r298181) @@ -96,15 +96,15 @@ login_fbtab(char *tty, uid_t uid, gid_t while (fgets(buf, sizeof(buf), fp)) { if ((cp = strchr(buf, '#'))) *cp = 0; /* strip comment */ - if ((cp = devname = strtok(buf, WSPACE)) == 0) + if ((cp = devname = strtok(buf, WSPACE)) == NULL) continue; /* empty or comment */ if (strncmp(devname, _PATH_DEV, sizeof _PATH_DEV - 1) != 0 - || (cp = strtok(NULL, WSPACE)) == 0 + || (cp = strtok(NULL, WSPACE)) == NULL || *cp != '0' || sscanf(cp, "%o", &prot) == 0 || prot == 0 || (prot & 0777) != prot - || (cp = strtok(NULL, WSPACE)) == 0) { + || (cp = strtok(NULL, WSPACE)) == NULL) { syslog(LOG_ERR, "%s: bad entry: %s", table, cp ? cp : "(null)"); continue; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604180526.u3I5QWSN021426>