mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-23 02:04:46 +00:00
Change `(foo *)0'' to
`NULL'' where it's possible
(and it appears possible throughout ftpd(8) source.) It is not a mere issue of style: Null pointers in C seem to have been mistaken one way or another quite often.
This commit is contained in:
parent
0e519c96ef
commit
aa5a9d3fff
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=132931
|
@ -106,7 +106,7 @@ static int cmd_form;
|
||||||
static int cmd_bytesz;
|
static int cmd_bytesz;
|
||||||
static int state;
|
static int state;
|
||||||
char cbuf[512];
|
char cbuf[512];
|
||||||
char *fromname = (char *) 0;
|
char *fromname = NULL;
|
||||||
|
|
||||||
extern int epsvall;
|
extern int epsvall;
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ cmd_list
|
||||||
{
|
{
|
||||||
if (fromname)
|
if (fromname)
|
||||||
free(fromname);
|
free(fromname);
|
||||||
fromname = (char *) 0;
|
fromname = NULL;
|
||||||
restart_point = 0;
|
restart_point = 0;
|
||||||
}
|
}
|
||||||
| cmd_list rcmd
|
| cmd_list rcmd
|
||||||
|
@ -455,7 +455,7 @@ cmd
|
||||||
if (noretr || (guest && noguestretr))
|
if (noretr || (guest && noguestretr))
|
||||||
reply(500, "RETR command is disabled");
|
reply(500, "RETR command is disabled");
|
||||||
else if ($2 && $4 != NULL)
|
else if ($2 && $4 != NULL)
|
||||||
retrieve((char *) 0, $4);
|
retrieve(NULL, $4);
|
||||||
|
|
||||||
if ($4 != NULL)
|
if ($4 != NULL)
|
||||||
free($4);
|
free($4);
|
||||||
|
@ -522,7 +522,7 @@ cmd
|
||||||
if (fromname) {
|
if (fromname) {
|
||||||
renamecmd(fromname, $4);
|
renamecmd(fromname, $4);
|
||||||
free(fromname);
|
free(fromname);
|
||||||
fromname = (char *) 0;
|
fromname = NULL;
|
||||||
} else {
|
} else {
|
||||||
reply(503, "Bad sequence of commands.");
|
reply(503, "Bad sequence of commands.");
|
||||||
}
|
}
|
||||||
|
@ -550,7 +550,7 @@ cmd
|
||||||
}
|
}
|
||||||
| HELP CRLF
|
| HELP CRLF
|
||||||
{
|
{
|
||||||
help(cmdtab, (char *) 0);
|
help(cmdtab, NULL);
|
||||||
}
|
}
|
||||||
| HELP SP STRING CRLF
|
| HELP SP STRING CRLF
|
||||||
{
|
{
|
||||||
|
@ -563,7 +563,7 @@ cmd
|
||||||
if (*cp)
|
if (*cp)
|
||||||
help(sitetab, cp);
|
help(sitetab, cp);
|
||||||
else
|
else
|
||||||
help(sitetab, (char *) 0);
|
help(sitetab, NULL);
|
||||||
} else
|
} else
|
||||||
help(cmdtab, $3);
|
help(cmdtab, $3);
|
||||||
free($3);
|
free($3);
|
||||||
|
@ -598,7 +598,7 @@ cmd
|
||||||
}
|
}
|
||||||
| SITE SP HELP CRLF
|
| SITE SP HELP CRLF
|
||||||
{
|
{
|
||||||
help(sitetab, (char *) 0);
|
help(sitetab, NULL);
|
||||||
}
|
}
|
||||||
| SITE SP HELP SP STRING CRLF
|
| SITE SP HELP SP STRING CRLF
|
||||||
{
|
{
|
||||||
|
@ -771,7 +771,7 @@ rcmd
|
||||||
if ($2 && $4) {
|
if ($2 && $4) {
|
||||||
if (fromname)
|
if (fromname)
|
||||||
free(fromname);
|
free(fromname);
|
||||||
fromname = (char *) 0;
|
fromname = NULL;
|
||||||
if (renamefrom($4))
|
if (renamefrom($4))
|
||||||
fromname = $4;
|
fromname = $4;
|
||||||
else
|
else
|
||||||
|
@ -785,7 +785,7 @@ rcmd
|
||||||
if ($2) {
|
if ($2) {
|
||||||
if (fromname)
|
if (fromname)
|
||||||
free(fromname);
|
free(fromname);
|
||||||
fromname = (char *) 0;
|
fromname = NULL;
|
||||||
restart_point = $4.o;
|
restart_point = $4.o;
|
||||||
reply(350, "Restarting at %jd. %s",
|
reply(350, "Restarting at %jd. %s",
|
||||||
(intmax_t)restart_point,
|
(intmax_t)restart_point,
|
||||||
|
@ -1556,7 +1556,7 @@ help(struct tab *ctab, char *s)
|
||||||
}
|
}
|
||||||
upper(s);
|
upper(s);
|
||||||
c = lookup(ctab, s);
|
c = lookup(ctab, s);
|
||||||
if (c == (struct tab *)0) {
|
if (c == NULL) {
|
||||||
reply(502, "Unknown command %s.", s);
|
reply(502, "Unknown command %s.", s);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1910,7 +1910,7 @@ dataconn(char *name, off_t size, char *mode)
|
||||||
if ((flags = fcntl(pdata, F_GETFL, 0)) == -1 ||
|
if ((flags = fcntl(pdata, F_GETFL, 0)) == -1 ||
|
||||||
fcntl(pdata, F_SETFL, flags | O_NONBLOCK) == -1)
|
fcntl(pdata, F_SETFL, flags | O_NONBLOCK) == -1)
|
||||||
goto pdata_err;
|
goto pdata_err;
|
||||||
if (select(pdata+1, &set, (fd_set *) 0, (fd_set *) 0, &timeout) <= 0 ||
|
if (select(pdata+1, &set, NULL, NULL, &timeout) <= 0 ||
|
||||||
(s = accept(pdata, (struct sockaddr *) &from, &fromlen)) < 0)
|
(s = accept(pdata, (struct sockaddr *) &from, &fromlen)) < 0)
|
||||||
goto pdata_err;
|
goto pdata_err;
|
||||||
(void) close(pdata);
|
(void) close(pdata);
|
||||||
|
|
Loading…
Reference in a new issue