diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2002-09-04 23:29:10 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2002-09-04 23:29:10 +0000 |
| commit | b4339b74aded4c38ebcfe3a2a9b37b900abb8874 (patch) | |
| tree | fb230419005f211ecea1e667385bde9886dbf0d8 /usr.bin/makewhatis | |
| parent | 228b93ce829543fee06561687a63c17a7e821dfd (diff) | |
| download | FreeBSD-src-b4339b74aded4c38ebcfe3a2a9b37b900abb8874.zip FreeBSD-src-b4339b74aded4c38ebcfe3a2a9b37b900abb8874.tar.gz | |
ANSIify function definitions.
Add some constness to avoid some warnings.
Remove use register keyword.
Deal with missing/unneeded extern/prototypes.
Some minor type changes/casts to avoid warnings.
Reviewed by: md5
Diffstat (limited to 'usr.bin/makewhatis')
| -rw-r--r-- | usr.bin/makewhatis/makewhatis.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/makewhatis/makewhatis.c b/usr.bin/makewhatis/makewhatis.c index 0ac4fc1..30f2da8 100644 --- a/usr.bin/makewhatis/makewhatis.c +++ b/usr.bin/makewhatis/makewhatis.c @@ -98,7 +98,7 @@ static const char *whatis_name="whatis";/* -n option: the name */ static char *common_output; /* -o option: the single output file */ static char *locale; /* user's locale if -L is used */ static char *lang_locale; /* short form of locale */ -static char *machine; +static const char *machine; static int exit_code; /* exit code to use when finished */ static SLIST_HEAD(, visited_dir) visited_dirs = @@ -358,7 +358,7 @@ open_output(char *name) static int linesort(const void *a, const void *b) { - return strcmp((const char *)(*(const char **)a), (const char *)(*(const char **)b)); + return strcmp((*(const char * const *)a), (*(const char * const *)b)); } /* @@ -810,8 +810,8 @@ process_page(struct page_info *page, char *section_dir) static int pagesort(const void *a, const void *b) { - struct page_info *p1 = *(struct page_info **) a; - struct page_info *p2 = *(struct page_info **) b; + const struct page_info *p1 = *(struct page_info * const *) a; + const struct page_info *p2 = *(struct page_info * const *) b; if (p1->inode == p2->inode) return strcmp(p1->name, p2->name); return p1->inode - p2->inode; @@ -964,8 +964,6 @@ int main(int argc, char **argv) { int opt; - extern int optind; - extern char *optarg; FILE *fp = NULL; while ((opt = getopt(argc, argv, "ai:n:o:vL")) != -1) { |
