diff options
author | kstailey <kstailey@cvs.openbsd.org> | 1997-06-18 22:42:50 +0000 |
---|---|---|
committer | kstailey <kstailey@cvs.openbsd.org> | 1997-06-18 22:42:50 +0000 |
commit | c8708ed93617f5d278f4f7faf294a6e7c57227df (patch) | |
tree | 83832809b6ff198d789d720827ee338c50df8b37 /bin/pdksh/edit.c | |
parent | e37d7f641aedb36d7e29530bb5d9c2fe398d1407 (diff) |
(foo *)0 -> NULL
Diffstat (limited to 'bin/pdksh/edit.c')
-rw-r--r-- | bin/pdksh/edit.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bin/pdksh/edit.c b/bin/pdksh/edit.c index 53c1fcb301a..fbfc8d3a630 100644 --- a/bin/pdksh/edit.c +++ b/bin/pdksh/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.4 1996/12/14 12:18:07 mickey Exp $ */ +/* $OpenBSD: edit.c,v 1.5 1997/06/18 22:42:31 kstailey Exp $ */ /* * Command line editing - common code @@ -459,7 +459,7 @@ x_complete_word(str, slen, is_command, nwordsp, ret) str, slen, &words); *nwordsp = nwords; if (nwords == 0) { - *ret = (char *) 0; + *ret = NULL; return -1; } @@ -490,10 +490,10 @@ x_print_expansions(nwords, words, is_command) /* Special case for 1 match (prefix is whole word) */ if (nwords == 1) - prefix_len = x_basename(words[0], (char *) 0); + prefix_len = x_basename(words[0], NULL); /* Any (non-trailing) slashes in non-common word suffixes? */ for (i = 0; i < nwords; i++) - if (x_basename(words[i] + prefix_len, (char *) 0) + if (x_basename(words[i] + prefix_len, NULL) > prefix_len) break; /* All in same directory? */ @@ -505,7 +505,7 @@ x_print_expansions(nwords, words, is_command) XPinit(l, nwords + 1); for (i = 0; i < nwords; i++) XPput(l, words[i] + prefix_len); - XPput(l, (char *) 0); + XPput(l, NULL); } } @@ -585,7 +585,7 @@ x_file_glob(flags, str, slen, wordsp) } afree(toglob, ATEMP); - *wordsp = nwords ? words : (char **) 0; + *wordsp = nwords ? words : NULL; return nwords; } @@ -649,7 +649,7 @@ x_command_glob(flags, str, slen, wordsp) nwords = XPsize(w); if (!nwords) { - *wordsp = (char **) 0; + *wordsp = NULL; XPfree(w); return 0; } @@ -667,7 +667,7 @@ x_command_glob(flags, str, slen, wordsp) alloc(sizeof(struct path_order_info) * nwords, ATEMP); for (i = 0; i < nwords; i++) { info[i].word = words[i]; - info[i].base = x_basename(words[i], (char *) 0); + info[i].base = x_basename(words[i], NULL); if (!last_info || info[i].base != last_info->base || FILENCMP(words[i], last_info->word, info[i].base) != 0) @@ -799,7 +799,7 @@ x_cf_glob(flags, buf, buflen, pos, startp, endp, wordsp, is_commandp) nwords = (is_command ? x_command_glob : x_file_glob)(flags, buf + *startp, len, &words); if (nwords == 0) { - *wordsp = (char **) 0; + *wordsp = NULL; return 0; } @@ -824,7 +824,7 @@ add_glob(str, slen) bool_t saw_slash = FALSE; if (slen < 0) - return (char *) 0; + return (NULL); toglob = str_nsave(str, slen + 1, ATEMP); /* + 1 for "*" */ toglob[slen] = '\0'; @@ -909,7 +909,7 @@ x_basename(s, se) { const char *p; - if (se == (char *) 0) + if (se == NULL) se = s + strlen(s); if (s == se) return 0; @@ -993,7 +993,7 @@ glob_path(flags, pat, wp, path) /* Check that each match is executable... */ words = (char **) XPptrv(*wp); for (i = j = oldsize; i < newsize; i++) { - if (search_access(words[i], X_OK, (int *) 0) >= 0) { + if (search_access(words[i], X_OK, NULL) >= 0) { words[j] = words[i]; if (!(flags & XCF_FULLPATH)) memmove(words[j], words[j] + pathlen, |