From fe6e52a7844cfe289850a690b59d9691947c95d6 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Sun, 24 Oct 1999 04:47:57 +0000 Subject: [PATCH] Cosmetique: use standard prototypes scheme Back out prev change: toupper is more compatible with sort -f --- usr.bin/comm/comm.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c index 545ea33c692c..1adaaeca4688 100644 --- a/usr.bin/comm/comm.c +++ b/usr.bin/comm/comm.c @@ -64,21 +64,9 @@ char *tabs[] = { "", "\t", "\t\t" }; FILE *file __P((char *)); void show __P((FILE *, char *, char *)); +int stricoll __P((char *, 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 main(argc, argv) int argc; @@ -214,3 +202,18 @@ usage() (void)fprintf(stderr, "usage: comm [-123i] file1 file2\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); +}