diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-11-09 16:46:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-11-09 16:46:44 +0000 |
| commit | 39bf022396745c82ae60c9ade8625e070bad1a0c (patch) | |
| tree | 7f2c0f35e328f16d0ed1141c6688871f1bf2731d /usr.bin/less/filename.c | |
| parent | b182ffb903242f1d2c9d8ff87b60608d7f8257ab (diff) | |
NULL_IFILE has no weird use patterns. NULL is sufficient.
Diffstat (limited to 'usr.bin/less/filename.c')
| -rw-r--r-- | usr.bin/less/filename.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/less/filename.c b/usr.bin/less/filename.c index 3ed929bd195..c22a7e67ef4 100644 --- a/usr.bin/less/filename.c +++ b/usr.bin/less/filename.c @@ -225,7 +225,7 @@ fexpand(char *s) IFILE ifile; #define fchar_ifile(c) \ - ((c) == '%' ? curr_ifile : (c) == '#' ? old_ifile : NULL_IFILE) + ((c) == '%' ? curr_ifile : (c) == '#' ? old_ifile : NULL) /* * Make one pass to see how big a buffer we @@ -247,7 +247,7 @@ fexpand(char *s) * Single char (not repeated). Treat specially. */ ifile = fchar_ifile(*fr); - if (ifile == NULL_IFILE) + if (ifile == NULL) n++; else n += strlen(get_filename(ifile)); @@ -277,7 +277,7 @@ fexpand(char *s) *to++ = *fr; } else if (fr[1] != *fr) { ifile = fchar_ifile(*fr); - if (ifile == NULL_IFILE) { + if (ifile == NULL) { *to++ = *fr; } else { (void) strlcpy(to, get_filename(ifile), |