diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 17:23:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 17:23:42 -0400 |
commit | b6e6e3a8408cdd3e9264df98c51953fa36968bee (patch) | |
tree | c85ede0f7b10c6ec11cb88e25b79cef4b156fae5 /drivers | |
parent | c80b2e3f62f335b137e02b63c339e33831407702 (diff) |
staging: csr: remove CsrStrCpy
It was really just strcpy() so use that instead. Also remove
CsrUtf8StrCpy() as no one was calling that function.
Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/csr/csr_serialize_primitive_types.c | 2 | ||||
-rw-r--r-- | drivers/staging/csr/csr_unicode.h | 24 | ||||
-rw-r--r-- | drivers/staging/csr/csr_utf16.c | 5 | ||||
-rw-r--r-- | drivers/staging/csr/csr_util.c | 5 | ||||
-rw-r--r-- | drivers/staging/csr/csr_util.h | 2 |
5 files changed, 1 insertions, 37 deletions
diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c index 5fb026c2710..2e4a8e90931 100644 --- a/drivers/staging/csr/csr_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_serialize_primitive_types.c | |||
@@ -123,7 +123,7 @@ void CsrCharStringSer(u8 *buffer, size_t *offset, const char *value) | |||
123 | { | 123 | { |
124 | if (value) | 124 | if (value) |
125 | { | 125 | { |
126 | CsrStrCpy(((char *) &buffer[*offset]), value); | 126 | strcpy(((char *) &buffer[*offset]), value); |
127 | *offset += CsrStrLen(value) + 1; | 127 | *offset += CsrStrLen(value) + 1; |
128 | } | 128 | } |
129 | else | 129 | else |
diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h index 44d7fd95a6b..b54a9ce9448 100644 --- a/drivers/staging/csr/csr_unicode.h +++ b/drivers/staging/csr/csr_unicode.h | |||
@@ -69,30 +69,6 @@ u8 *CsrUtf8StrTruncate(u8 *target, size_t count); | |||
69 | /******************************************************************************* | 69 | /******************************************************************************* |
70 | 70 | ||
71 | NAME | 71 | NAME |
72 | CsrUtf8StrCpy | ||
73 | |||
74 | DESCRIPTION | ||
75 | Copies the null terminated UTF-8 string pointed at by source into the | ||
76 | memory pointed at by target, including the terminating null character. | ||
77 | |||
78 | To avoid overflows, the size of the memory pointed at by target shall be | ||
79 | long enough to contain the same UTF-8 string as source (including the | ||
80 | terminating null character), and should not overlap in memory with | ||
81 | source. | ||
82 | |||
83 | PARAMETERS | ||
84 | target - Pointer to the target memory where the content is to be copied. | ||
85 | source - UTF-8 string to be copied. | ||
86 | |||
87 | RETURNS | ||
88 | Returns target | ||
89 | |||
90 | *******************************************************************************/ | ||
91 | u8 *CsrUtf8StrCpy(u8 *target, const u8 *source); | ||
92 | |||
93 | /******************************************************************************* | ||
94 | |||
95 | NAME | ||
96 | CsrUtf8StrNCpy | 72 | CsrUtf8StrNCpy |
97 | 73 | ||
98 | DESCRIPTION | 74 | DESCRIPTION |
diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index 46bd130a248..db91a73a1d3 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c | |||
@@ -1035,11 +1035,6 @@ u32 CsrUtf8StringLengthInBytes(const u8 *string) | |||
1035 | return (u32) length; | 1035 | return (u32) length; |
1036 | } | 1036 | } |
1037 | 1037 | ||
1038 | u8 *CsrUtf8StrCpy(u8 *target, const u8 *source) | ||
1039 | { | ||
1040 | return (u8 *) CsrStrCpy((char *) target, (const char *) source); | ||
1041 | } | ||
1042 | |||
1043 | u8 *CsrUtf8StrTruncate(u8 *target, size_t count) | 1038 | u8 *CsrUtf8StrTruncate(u8 *target, size_t count) |
1044 | { | 1039 | { |
1045 | size_t lastByte = count - 1; | 1040 | size_t lastByte = count - 1; |
diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index 20dbe3e040e..e1e9467cc9e 100644 --- a/drivers/staging/csr/csr_util.c +++ b/drivers/staging/csr/csr_util.c | |||
@@ -45,11 +45,6 @@ EXPORT_SYMBOL_GPL(CsrMemCpy); | |||
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #ifndef CSR_USE_STDC_LIB | 47 | #ifndef CSR_USE_STDC_LIB |
48 | char *CsrStrCpy(char *dest, const char *src) | ||
49 | { | ||
50 | return strcpy(dest, src); | ||
51 | } | ||
52 | |||
53 | char *CsrStrNCpy(char *dest, const char *src, size_t count) | 48 | char *CsrStrNCpy(char *dest, const char *src, size_t count) |
54 | { | 49 | { |
55 | return strncpy(dest, src, count); | 50 | return strncpy(dest, src, count); |
diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h index e4987b14216..c7aa3a6ecee 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h | |||
@@ -28,7 +28,6 @@ void CsrUInt16ToHex(u16 number, char *str); | |||
28 | /*------------------------------------------------------------------*/ | 28 | /*------------------------------------------------------------------*/ |
29 | #ifdef CSR_USE_STDC_LIB | 29 | #ifdef CSR_USE_STDC_LIB |
30 | #define CsrMemCpy memcpy | 30 | #define CsrMemCpy memcpy |
31 | #define CsrStrCpy strcpy | ||
32 | #define CsrStrNCpy strncpy | 31 | #define CsrStrNCpy strncpy |
33 | #define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2))) | 32 | #define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2))) |
34 | #define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n))) | 33 | #define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n))) |
@@ -36,7 +35,6 @@ void CsrUInt16ToHex(u16 number, char *str); | |||
36 | #define CsrStrLen strlen | 35 | #define CsrStrLen strlen |
37 | #else /* !CSR_USE_STDC_LIB */ | 36 | #else /* !CSR_USE_STDC_LIB */ |
38 | void *CsrMemCpy(void *dest, const void *src, size_t count); | 37 | void *CsrMemCpy(void *dest, const void *src, size_t count); |
39 | char *CsrStrCpy(char *dest, const char *src); | ||
40 | char *CsrStrNCpy(char *dest, const char *src, size_t count); | 38 | char *CsrStrNCpy(char *dest, const char *src, size_t count); |
41 | s32 CsrStrCmp(const char *string1, const char *string2); | 39 | s32 CsrStrCmp(const char *string1, const char *string2); |
42 | s32 CsrStrNCmp(const char *string1, const char *string2, size_t count); | 40 | s32 CsrStrNCmp(const char *string1, const char *string2, size_t count); |