From 6b9cc409de48052e4474150236a22a4b6b44fceb Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Tue, 18 Sep 2018 19:34:29 +0200 Subject: [PATCH] mtx, ppc: remove cistrcmp() and cistrncmp() redefinition --- sys/src/9/mtx/fns.h | 2 -- sys/src/9/mtx/main.c | 47 -------------------------------------------- sys/src/9/ppc/fns.h | 2 -- sys/src/9/ppc/main.c | 47 -------------------------------------------- 4 files changed, 98 deletions(-) diff --git a/sys/src/9/mtx/fns.h b/sys/src/9/mtx/fns.h index f03e79e3a..98d2b28cc 100644 --- a/sys/src/9/mtx/fns.h +++ b/sys/src/9/mtx/fns.h @@ -1,8 +1,6 @@ #include "../port/portfns.h" ulong cankaddr(ulong); -int cistrcmp(char*, char*); -int cistrncmp(char*, char*, int); void clockinit(void); void clockintr(Ureg*); void clockintrsched(void); diff --git a/sys/src/9/mtx/main.c b/sys/src/9/mtx/main.c index 6eb0fd7bd..fb4132f37 100644 --- a/sys/src/9/mtx/main.c +++ b/sys/src/9/mtx/main.c @@ -394,53 +394,6 @@ isaconfig(char *class, int ctlrno, ISAConf *isa) return 1; } -int -cistrcmp(char *a, char *b) -{ - int ac, bc; - - for(;;){ - ac = *a++; - bc = *b++; - - if(ac >= 'A' && ac <= 'Z') - ac = 'a' + (ac - 'A'); - if(bc >= 'A' && bc <= 'Z') - bc = 'a' + (bc - 'A'); - ac -= bc; - if(ac) - return ac; - if(bc == 0) - break; - } - return 0; -} - -int -cistrncmp(char *a, char *b, int n) -{ - unsigned ac, bc; - - while(n > 0){ - ac = *a++; - bc = *b++; - n--; - - if(ac >= 'A' && ac <= 'Z') - ac = 'a' + (ac - 'A'); - if(bc >= 'A' && bc <= 'Z') - bc = 'a' + (bc - 'A'); - - ac -= bc; - if(ac) - return ac; - if(bc == 0) - break; - } - - return 0; -} - void setupwatchpts(Proc *, Watchpt *, int n) { diff --git a/sys/src/9/ppc/fns.h b/sys/src/9/ppc/fns.h index d338f02fc..5ae2f8097 100644 --- a/sys/src/9/ppc/fns.h +++ b/sys/src/9/ppc/fns.h @@ -1,7 +1,5 @@ #include "../port/portfns.h" -int cistrcmp(char*, char*); -int cistrncmp(char*, char*, int); void clockinit(void); void clockintr(Ureg*); void cpuidprint(void); diff --git a/sys/src/9/ppc/main.c b/sys/src/9/ppc/main.c index 5440fedae..e2ab259cd 100644 --- a/sys/src/9/ppc/main.c +++ b/sys/src/9/ppc/main.c @@ -450,53 +450,6 @@ isaconfig(char *class, int ctlrno, ISAConf *isa) return 1; } -int -cistrcmp(char *a, char *b) -{ - int ac, bc; - - for(;;){ - ac = *a++; - bc = *b++; - - if(ac >= 'A' && ac <= 'Z') - ac = 'a' + (ac - 'A'); - if(bc >= 'A' && bc <= 'Z') - bc = 'a' + (bc - 'A'); - ac -= bc; - if(ac) - return ac; - if(bc == 0) - break; - } - return 0; -} - -int -cistrncmp(char *a, char *b, int n) -{ - unsigned ac, bc; - - while(n > 0){ - ac = *a++; - bc = *b++; - n--; - - if(ac >= 'A' && ac <= 'Z') - ac = 'a' + (ac - 'A'); - if(bc >= 'A' && bc <= 'Z') - bc = 'a' + (bc - 'A'); - - ac -= bc; - if(ac) - return ac; - if(bc == 0) - break; - } - - return 0; -} - void setupwatchpts(Proc *, Watchpt *, int n) {