diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-03-29 04:18:42 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 04:54:39 -0400 |
commit | ded220bd8f0823771fc0a9bdf7f5bcbe543197b6 (patch) | |
tree | 530854859821c51cb3bcd9092140c535153627e5 /arch/ppc | |
parent | 357418e7cac16fed4ca558c6037d189d2109c9c2 (diff) |
[STRING]: Move strcasecmp/strncasecmp to lib/string.c
We have several platforms using local copies of identical
code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 2 | ||||
-rw-r--r-- | arch/ppc/lib/Makefile | 2 | ||||
-rw-r--r-- | arch/ppc/lib/strcase.c | 24 |
3 files changed, 1 insertions, 27 deletions
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 1318b6f4c3df..4ad499605d05 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
@@ -93,8 +93,6 @@ EXPORT_SYMBOL(strncpy); | |||
93 | EXPORT_SYMBOL(strcat); | 93 | EXPORT_SYMBOL(strcat); |
94 | EXPORT_SYMBOL(strlen); | 94 | EXPORT_SYMBOL(strlen); |
95 | EXPORT_SYMBOL(strcmp); | 95 | EXPORT_SYMBOL(strcmp); |
96 | EXPORT_SYMBOL(strcasecmp); | ||
97 | EXPORT_SYMBOL(strncasecmp); | ||
98 | EXPORT_SYMBOL(__div64_32); | 96 | EXPORT_SYMBOL(__div64_32); |
99 | 97 | ||
100 | EXPORT_SYMBOL(csum_partial); | 98 | EXPORT_SYMBOL(csum_partial); |
diff --git a/arch/ppc/lib/Makefile b/arch/ppc/lib/Makefile index 50358e4ea159..422bef9bae7b 100644 --- a/arch/ppc/lib/Makefile +++ b/arch/ppc/lib/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for ppc-specific library files.. | 2 | # Makefile for ppc-specific library files.. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := checksum.o string.o strcase.o div64.o | 5 | obj-y := checksum.o string.o div64.o |
6 | 6 | ||
7 | obj-$(CONFIG_8xx) += rheap.o | 7 | obj-$(CONFIG_8xx) += rheap.o |
8 | obj-$(CONFIG_CPM2) += rheap.o | 8 | obj-$(CONFIG_CPM2) += rheap.o |
diff --git a/arch/ppc/lib/strcase.c b/arch/ppc/lib/strcase.c deleted file mode 100644 index 3b0094cc2b52..000000000000 --- a/arch/ppc/lib/strcase.c +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | #include <linux/ctype.h> | ||
2 | #include <linux/types.h> | ||
3 | |||
4 | int strcasecmp(const char *s1, const char *s2) | ||
5 | { | ||
6 | int c1, c2; | ||
7 | |||
8 | do { | ||
9 | c1 = tolower(*s1++); | ||
10 | c2 = tolower(*s2++); | ||
11 | } while (c1 == c2 && c1 != 0); | ||
12 | return c1 - c2; | ||
13 | } | ||
14 | |||
15 | int strncasecmp(const char *s1, const char *s2, size_t n) | ||
16 | { | ||
17 | int c1, c2; | ||
18 | |||
19 | do { | ||
20 | c1 = tolower(*s1++); | ||
21 | c2 = tolower(*s2++); | ||
22 | } while ((--n > 0) && c1 == c2 && c1 != 0); | ||
23 | return c1 - c2; | ||
24 | } | ||