projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a more reliable way of setting the initial state of PsppireDialogAction objects.
[pspp]
/
tests
/
libpspp
/
stringi-set-test.c
diff --git
a/tests/libpspp/stringi-set-test.c
b/tests/libpspp/stringi-set-test.c
index a20e84ce185d9ab2087860bbe0a878d8a7cc2e74..2bcc760780c4bde4f78e718582d9fbcdf9f92f03 100644
(file)
--- a/
tests/libpspp/stringi-set-test.c
+++ b/
tests/libpspp/stringi-set-test.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010
, 2012, 2014
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
@@
-36,6
+36,7
@@
#include <string.h>
#include "libpspp/compiler.h"
#include <string.h>
#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
#include "libpspp/str.h"
\f
/* Exit with a failure code.
#include "libpspp/str.h"
\f
/* Exit with a failure code.
@@
-132,7
+133,7
@@
make_string (int value)
if (*s == NULL)
{
*s = xmalloc (16);
if (*s == NULL)
{
*s = xmalloc (16);
- str_format_26adic (value + 1, *s, 16);
+ str_format_26adic (value + 1,
true,
*s, 16);
}
return *s;
}
}
return *s;
}
@@
-244,7
+245,7
@@
check_set_contains (struct stringi_set *set, const char *string)
node = stringi_set_find_node (set, string);
check (node != NULL);
node = stringi_set_find_node (set, string);
check (node != NULL);
- check (!strcasecmp (string, stringi_set_node_get_string (node)));
+ check (!
utf8_
strcasecmp (string, stringi_set_node_get_string (node)));
}
/* Checks that SET contains the CNT strings in DATA, that its structure is
}
/* Checks that SET contains the CNT strings in DATA, that its structure is
@@
-302,7
+303,7
@@
check_stringi_set (struct stringi_set *set, const int data[], size_t cnt)
check (s == array[i]);
for (j = 0; j < left; j++)
check (s == array[i]);
for (j = 0; j < left; j++)
- if (!strcasecmp (s, make_string (data_copy[j])))
+ if (!
utf8_
strcasecmp (s, make_string (data_copy[j])))
{
data_copy[j] = data_copy[--left];
goto next;
{
data_copy[j] = data_copy[--left];
goto next;
@@
-319,7
+320,7
@@
check_stringi_set (struct stringi_set *set, const int data[], size_t cnt)
for (i = 0; i < cnt; i++)
{
if (i > 0)
for (i = 0; i < cnt; i++)
{
if (i > 0)
- check (strcasecmp (array[i - 1], array[i]) < 0);
+ check (
utf8_
strcasecmp (array[i - 1], array[i]) < 0);
check (stringi_set_contains (set, array[i]));
}
free (array);
check (stringi_set_contains (set, array[i]));
}
free (array);