From 7e295315e690fd7e18e9065d02e101a4a13c70d3 Mon Sep 17 00:00:00 2001 From: Yaroslav Tykhiy Date: Wed, 17 Nov 2004 11:52:41 +0000 Subject: [PATCH] Kill more unneeded casts found. Noticed by: Nick Leuta (some of them) --- libexec/ftpd/ftpcmd.y | 2 +- libexec/ftpd/ftpd.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 2a8708dd64ac..05086e391bd1 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1399,7 +1399,7 @@ yylex(void) c = cbuf[cpos]; cbuf[cpos] = '\0'; yylval.u.i = atoi(cp); - yylval.u.o = strtoull(cp, (char **)NULL, 10); + yylval.u.o = strtoull(cp, NULL, 10); cbuf[cpos] = c; return (NUMBER); } diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index cd31881eedbc..a50dabde9d85 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1035,7 +1035,7 @@ user(char *name) syslog(LOG_NOTICE, "FTP LOGIN REFUSED FROM %s, %s", remotehost, name); - pw = (struct passwd *) NULL; + pw = NULL; return; } } @@ -2058,7 +2058,7 @@ send_data(FILE *instr, FILE *outstr, size_t blksize, off_t filesize, int isreg) while (filesize > 0) { err = sendfile(filefd, netfd, offset, 0, - (struct sf_hdtr *) NULL, &cnt, 0); + NULL, &cnt, 0); /* * Calculate byte_count before OOB processing. * It can be used in myoob() later. @@ -2553,7 +2553,7 @@ pwd(void) { char *s, path[MAXPATHLEN + 1]; - if (getwd(path) == (char *)NULL) + if (getwd(path) == NULL) reply(550, "%s.", path); else { if ((s = doublequote(path)) == NULL)