projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: log cherry-pick [93b28fe]->[e7f1d9f] ioctl: Move autoconf macro to a...
[gnulib.git]
/
tests
/
test-c-strcasestr.c
diff --git
a/tests/test-c-strcasestr.c
b/tests/test-c-strcasestr.c
index
683bfe7
..
a97ea14
100644
(file)
--- a/
tests/test-c-strcasestr.c
+++ b/
tests/test-c-strcasestr.c
@@
-1,5
+1,5
@@
/* Test of case-insensitive searching in a string.
/* Test of case-insensitive searching in a string.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
-2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-20,20
+20,10
@@
#include "c-strcasestr.h"
#include "c-strcasestr.h"
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
int
main ()
int
main ()
@@
-62,6
+52,12
@@
main ()
ASSERT (result == NULL);
}
ASSERT (result == NULL);
}
+ {
+ const char input[] = "ABC ABCDAB ABCDABCDABDE";
+ const char *result = c_strcasestr (input, "ABCDaBCD");
+ ASSERT (result == input + 11);
+ }
+
/* Check that a very long haystack is handled quickly if the needle is
short and occurs near the beginning. */
{
/* Check that a very long haystack is handled quickly if the needle is
short and occurs near the beginning. */
{
@@
-74,16
+70,16
@@
main ()
char *haystack = (char *) malloc (m + 1);
if (haystack != NULL)
{
char *haystack = (char *) malloc (m + 1);
if (haystack != NULL)
{
- memset (haystack, 'A', m);
- haystack[0] = 'B';
- haystack[m] = '\0';
+
memset (haystack, 'A', m);
+
haystack[0] = 'B';
+
haystack[m] = '\0';
- for (; repeat > 0; repeat--)
- {
- ASSERT (c_strcasestr (haystack, needle) == haystack + 1);
- }
+
for (; repeat > 0; repeat--)
+
{
+
ASSERT (c_strcasestr (haystack, needle) == haystack + 1);
+
}
- free (haystack);
+
free (haystack);
}
}
}
}
@@
-98,15
+94,15
@@
main ()
char *needle = (char *) malloc (m + 1);
if (needle != NULL)
{
char *needle = (char *) malloc (m + 1);
if (needle != NULL)
{
- memset (needle, 'A', m);
- needle[m] = '\0';
+
memset (needle, 'A', m);
+
needle[m] = '\0';
- for (; repeat > 0; repeat--)
- {
- ASSERT (c_strcasestr (haystack, needle) == NULL);
- }
+
for (; repeat > 0; repeat--)
+
{
+
ASSERT (c_strcasestr (haystack, needle) == NULL);
+
}
- free (needle);
+
free (needle);
}
}
}
}
@@
-117,23
+113,21
@@
main ()
char *needle = (char *) malloc (m + 2);
if (haystack != NULL && needle != NULL)
{
char *needle = (char *) malloc (m + 2);
if (haystack != NULL && needle != NULL)
{
- const char *result;
+
const char *result;
- memset (haystack, 'A', 2 * m);
- haystack[2 * m] = 'B';
- haystack[2 * m + 1] = '\0';
+
memset (haystack, 'A', 2 * m);
+
haystack[2 * m] = 'B';
+
haystack[2 * m + 1] = '\0';
- memset (needle, 'a', m);
- needle[m] = 'B';
- needle[m + 1] = '\0';
+
memset (needle, 'a', m);
+
needle[m] = 'B';
+
needle[m + 1] = '\0';
- result = c_strcasestr (haystack, needle);
- ASSERT (result == haystack + m);
+
result = c_strcasestr (haystack, needle);
+
ASSERT (result == haystack + m);
}
}
- if (needle != NULL)
- free (needle);
- if (haystack != NULL)
- free (haystack);
+ free (needle);
+ free (haystack);
}
return 0;
}
return 0;