diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | iconv/tst-iconv5.c | 20 |
2 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index d35a29b926..0f2d1d9c57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2015-02-25 Roland McGrath <roland@hack.frob.com> + * iconv/tst-iconv5.c (testcode, number): Make variables static const. + (convert): Make function static. + (test_unalign): Likewise. Add const to argument pointee types. + (main): Replace with static function do_test. + Print "Succeeded." only if RET is zero. + (TEST_FUNCTION): New macro. + Include test-skeleton.c. + * iconv/gconv_conf.c (__gconv_get_path): Don't crash if __getcwd returns a null pointer. diff --git a/iconv/tst-iconv5.c b/iconv/tst-iconv5.c index 6640ac9f71..b17e484155 100644 --- a/iconv/tst-iconv5.c +++ b/iconv/tst-iconv5.c @@ -38,7 +38,7 @@ struct convcode }; /* test builtin transformation */ -struct convcode testcode[] = { +static const struct convcode testcode[] = { {"ASCII", "ASCII"}, {"UTF-8", "ASCII"}, {"UCS-2BE", "ASCII"}, @@ -47,9 +47,9 @@ struct convcode testcode[] = { {"UCS-4LE", "ASCII"}, }; -int number = (int) sizeof (testcode) / sizeof (struct convcode); +static const int number = (int) sizeof (testcode) / sizeof (struct convcode); -int +static int convert (const char *tocode, const char *fromcode, char *inbufp, size_t inbytesleft, char *outbufp, size_t outbytesleft) { @@ -88,8 +88,8 @@ convert (const char *tocode, const char *fromcode, char *inbufp, } -int -test_unalign (struct convcode *codes, char *str, int len) +static int +test_unalign (const struct convcode *codes, const char *str, int len) { struct unalign *inbufp, *outbufp; char *inbuf, *outbuf; @@ -137,8 +137,8 @@ test_unalign (struct convcode *codes, char *str, int len) return 0; } -int -main (int argc, char *argv[]) +static int +do_test (void) { int i; int ret = 0; @@ -151,7 +151,11 @@ main (int argc, char *argv[]) printf ("iconv: %s <-> %s: ok\n", testcode[i].fromcode, testcode[i].tocode); } - printf ("Succeeded.\n"); + if (ret == 0) + printf ("Succeeded.\n"); return ret; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |