fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak NULL-pointer checks

Browse Source 
Use !p and p when comparing pointers as opposed to explicit
checks against NULL.  This is generally easier to read.
This commit is contained in:
FRIGN
2014-11-13 22:16:29 +01:00
committed by sin
parent ec8246bbc6
commit 7fc5856e64
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
uudecode.c
View File

@@ -40,14 +40,14 @@ main(int argc, char *argv[])
if (argc == 0) {
parseheader(stdin, "<stdin>", "begin ", &mode, &fname);
if ((nfp = parsefile(fname)) == NULL)
if (!(nfp = parsefile(fname)))
eprintf("fopen %s:", fname);
uudecode(stdin, nfp);
} else {
if ((fp = fopen(argv[0], "r")) == NULL)
if (!(fp = fopen(argv[0], "r")))
eprintf("fopen %s:", argv[0]);
parseheader(fp, argv[0], "begin ", &mode, &fname);
if ((nfp = parsefile(fname)) == NULL)
if (!(nfp = parsefile(fname)))
eprintf("fopen %s:", fname);
uudecode(fp, nfp);
}
@@ -93,18 +93,18 @@ parseheader(FILE *fp, const char *s, const char *header, mode_t *mode, char **fn
char *p, *q;
size_t n;
if (fgets(bufs, sizeof(bufs), fp) == NULL)
if (!fgets(bufs, sizeof(bufs), fp))
if (ferror(fp))
eprintf("%s: read error:", s);
if (bufs[0] == '\0' || feof(fp))
eprintf("empty or nil header string\n");
if ((p = strchr(bufs, '\n')) == NULL)
if (!(p = strchr(bufs, '\n')))
eprintf("header string too long or non-newline terminated file\n");
p = bufs;
if (strncmp(bufs, header, strlen(header)) != 0)
eprintf("malformed header prefix\n");
p += strlen(header);
if ((q = strchr(p, ' ')) == NULL)
if (!(q = strchr(p, ' ')))
eprintf("malformed mode string in header\n");
*q++ = '\0';
/* now mode should be null terminated, q points to fname */