shithub: riscv

Download patch

ref: 6b9cc409de48052e4474150236a22a4b6b44fceb
parent: bd49212b467c60d6d5e4e2eefc13ec88012ec785
author: cinap_lenrek <[email protected]>
date: Tue Sep 18 15:34:29 EDT 2018

mtx, ppc: remove cistrcmp() and cistrncmp() redefinition

--- 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);
--- a/sys/src/9/mtx/main.c
+++ b/sys/src/9/mtx/main.c
@@ -394,53 +394,6 @@
 	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)
 {
--- 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);
--- a/sys/src/9/ppc/main.c
+++ b/sys/src/9/ppc/main.c
@@ -450,53 +450,6 @@
 	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)
 {