aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/lib/string.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/lib/string.c')
-rw-r--r--arch/s390/lib/string.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c
index dbf2fdad2724..a10e11f7a5f7 100644
--- a/arch/s390/lib/string.c
+++ b/arch/s390/lib/string.c
@@ -56,7 +56,7 @@ EXPORT_SYMBOL(strlen);
56 * 56 *
57 * returns the minimum of the length of @s and @n 57 * returns the minimum of the length of @s and @n
58 */ 58 */
59size_t strnlen(const char * s, size_t n) 59size_t strnlen(const char *s, size_t n)
60{ 60{
61 return __strnend(s, n) - s; 61 return __strnend(s, n) - s;
62} 62}
@@ -195,14 +195,14 @@ EXPORT_SYMBOL(strncat);
195 195
196/** 196/**
197 * strcmp - Compare two strings 197 * strcmp - Compare two strings
198 * @cs: One string 198 * @s1: One string
199 * @ct: Another string 199 * @s2: Another string
200 * 200 *
201 * returns 0 if @cs and @ct are equal, 201 * returns 0 if @s1 and @s2 are equal,
202 * < 0 if @cs is less than @ct 202 * < 0 if @s1 is less than @s2
203 * > 0 if @cs is greater than @ct 203 * > 0 if @s1 is greater than @s2
204 */ 204 */
205int strcmp(const char *cs, const char *ct) 205int strcmp(const char *s1, const char *s2)
206{ 206{
207 register int r0 asm("0") = 0; 207 register int r0 asm("0") = 0;
208 int ret = 0; 208 int ret = 0;
@@ -214,7 +214,7 @@ int strcmp(const char *cs, const char *ct)
214 " ic %1,0(%3)\n" 214 " ic %1,0(%3)\n"
215 " sr %0,%1\n" 215 " sr %0,%1\n"
216 "1:" 216 "1:"
217 : "+d" (ret), "+d" (r0), "+a" (cs), "+a" (ct) 217 : "+d" (ret), "+d" (r0), "+a" (s1), "+a" (s2)
218 : : "cc", "memory"); 218 : : "cc", "memory");
219 return ret; 219 return ret;
220} 220}
@@ -225,7 +225,7 @@ EXPORT_SYMBOL(strcmp);
225 * @s: The string to be searched 225 * @s: The string to be searched
226 * @c: The character to search for 226 * @c: The character to search for
227 */ 227 */
228char * strrchr(const char * s, int c) 228char *strrchr(const char *s, int c)
229{ 229{
230 size_t len = __strend(s) - s; 230 size_t len = __strend(s) - s;
231 231
@@ -261,7 +261,7 @@ static inline int clcle(const char *s1, unsigned long l1,
261 * @s1: The string to be searched 261 * @s1: The string to be searched
262 * @s2: The string to search for 262 * @s2: The string to search for
263 */ 263 */
264char * strstr(const char * s1,const char * s2) 264char *strstr(const char *s1, const char *s2)
265{ 265{
266 int l1, l2; 266 int l1, l2;
267 267
@@ -307,15 +307,15 @@ EXPORT_SYMBOL(memchr);
307 307
308/** 308/**
309 * memcmp - Compare two areas of memory 309 * memcmp - Compare two areas of memory
310 * @cs: One area of memory 310 * @s1: One area of memory
311 * @ct: Another area of memory 311 * @s2: Another area of memory
312 * @count: The size of the area. 312 * @count: The size of the area.
313 */ 313 */
314int memcmp(const void *cs, const void *ct, size_t n) 314int memcmp(const void *s1, const void *s2, size_t n)
315{ 315{
316 int ret; 316 int ret;
317 317
318 ret = clcle(cs, n, ct, n); 318 ret = clcle(s1, n, s2, n);
319 if (ret) 319 if (ret)
320 ret = ret == 1 ? -1 : 1; 320 ret = ret == 1 ? -1 : 1;
321 return ret; 321 return ret;