Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 14 Feb 2012 10:11:46 +0000 (UTC)
From:      Kevin Lo <kevlo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r231651 - in head/usr.bin: chpass login
Message-ID:  <201202141011.q1EABk4W091892@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kevlo
Date: Tue Feb 14 10:11:45 2012
New Revision: 231651
URL: http://svn.freebsd.org/changeset/base/231651

Log:
  Remove unnecessary cast

Modified:
  head/usr.bin/chpass/util.c
  head/usr.bin/login/login_fbtab.c

Modified: head/usr.bin/chpass/util.c
==============================================================================
--- head/usr.bin/chpass/util.c	Tue Feb 14 09:42:02 2012	(r231650)
+++ head/usr.bin/chpass/util.c	Tue Feb 14 10:11:45 2012	(r231651)
@@ -110,10 +110,10 @@ atot(char *p, time_t *store)
 			}
 		}
 	}
-	if (!(t = strtok((char *)NULL, " \t,")) || !isdigit(*t))
+	if (!(t = strtok(NULL, " \t,")) || !isdigit(*t))
 		goto bad;
 	day = atoi(t);
-	if (!(t = strtok((char *)NULL, " \t,")) || !isdigit(*t))
+	if (!(t = strtok(NULL, " \t,")) || !isdigit(*t))
 		goto bad;
 	year = atoi(t);
 	if (day < 1 || day > 31 || month < 1 || month > 12)

Modified: head/usr.bin/login/login_fbtab.c
==============================================================================
--- head/usr.bin/login/login_fbtab.c	Tue Feb 14 09:42:02 2012	(r231650)
+++ head/usr.bin/login/login_fbtab.c	Tue Feb 14 10:11:45 2012	(r231651)
@@ -100,17 +100,17 @@ login_fbtab(char *tty, uid_t uid, gid_t 
 	if ((cp = devname = strtok(buf, WSPACE)) == 0)
 	    continue;				/* empty or comment */
 	if (strncmp(devname, _PATH_DEV, sizeof _PATH_DEV - 1) != 0
-	       || (cp = strtok((char *) 0, WSPACE)) == 0
+	       || (cp = strtok(NULL, WSPACE)) == 0
 	       || *cp != '0'
 	       || sscanf(cp, "%o", &prot) == 0
 	       || prot == 0
 	       || (prot & 0777) != prot
-	       || (cp = strtok((char *) 0, WSPACE)) == 0) {
+	       || (cp = strtok(NULL, WSPACE)) == 0) {
 	    syslog(LOG_ERR, "%s: bad entry: %s", table, cp ? cp : "(null)");
 	    continue;
 	}
 	if (strcmp(devname + 5, tty) == 0) {
-	    for (cp = strtok(cp, ":"); cp; cp = strtok((char *) 0, ":")) {
+	    for (cp = strtok(cp, ":"); cp; cp = strtok(NULL, ":")) {
 		login_protect(table, cp, prot, uid, gid);
 	    }
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202141011.q1EABk4W091892>