From d8f93ede383e9abcfdda58b79d5444b4bab65c6c Mon Sep 17 00:00:00 2001 From: ache Date: Sun, 24 Oct 1999 04:41:31 +0000 Subject: Cosmetique: use standard prototypes scheme Back out prev. change: toupper is more compatible with sort -f --- usr.bin/uniq/uniq.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'usr.bin/uniq') diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 1a5d8dc..e185cef 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -67,19 +67,7 @@ void show __P((FILE *, char *)); char *skip __P((char *)); void obsolete __P((char *[])); static void usage __P((void)); - -int stricoll(char *s1, char *s2) -{ - char *p, line1[MAXLINELEN], line2[MAXLINELEN]; - - for (p = line1; *s1; s1++) - *p++ = tolower((unsigned char)*s1); - *p = '\0'; - for (p = line2; *s2; s2++) - *p++ = tolower((unsigned char)*s2); - *p = '\0'; - return strcoll(s1, s2); -} +int stricoll __P((char *, char*)); int main (argc, argv) @@ -274,3 +262,18 @@ usage() "usage: uniq [-c | -du | -i] [-f fields] [-s chars] [input [output]]\n"); exit(1); } + +int +stricoll(s1, s2) + char *s1, *s2; +{ + char *p, line1[MAXLINELEN], line2[MAXLINELEN]; + + for (p = line1; *s1; s1++) + *p++ = toupper((unsigned char)*s1); + *p = '\0'; + for (p = line2; *s2; s2++) + *p++ = toupper((unsigned char)*s2); + *p = '\0'; + return strcoll(s1, s2); +} -- cgit v1.1