changeset 40155:84fd38f4932c

tests: Fix some "unused variable" warnings. * tests/test-fts.c (fts_dealloc): Remove unused variable. * tests/unigbrk/test-uc-grapheme-breaks.c (main): Likewise. * tests/test-striconveh.c (main): Move some variable into the '#if HAVE_ICONV'. * tests/test-striconveha.c (main): Likewise. * tests/uniconv/test-u8-conv-from-enc.c (main): Likewise. * tests/uniconv/test-u16-conv-from-enc.c (main): Likewise. * tests/uniconv/test-u32-conv-from-enc.c (main): Likewise. * tests/uniconv/test-u8-conv-to-enc.c (main): Likewise. * tests/uniconv/test-u16-conv-to-enc.c (main): Likewise. * tests/uniconv/test-u32-conv-to-enc.c (main): Likewise. * tests/uniconv/test-u8-strconv-from-enc.c (main): Likewise. * tests/uniconv/test-u16-strconv-from-enc.c (main): Likewise. * tests/uniconv/test-u32-strconv-from-enc.c (main): Likewise. * tests/uniconv/test-u8-strconv-to-enc.c (main): Likewise. * tests/uniconv/test-u16-strconv-to-enc.c (main): Likewise. * tests/uniconv/test-u32-strconv-to-enc.c (main): Likewise. * tests/test-tsearch.c (main): Move some variable into the '#if HAVE_INITSTATE'.
author Bruno Haible <bruno@clisp.org>
date Sun, 27 Jan 2019 12:24:47 +0100
parents df1c9ad85e3e
children 066c585853e5
files ChangeLog tests/test-fts.c tests/test-striconveh.c tests/test-striconveha.c tests/test-tsearch.c tests/uniconv/test-u16-conv-from-enc.c tests/uniconv/test-u16-conv-to-enc.c tests/uniconv/test-u16-strconv-from-enc.c tests/uniconv/test-u16-strconv-to-enc.c tests/uniconv/test-u32-conv-from-enc.c tests/uniconv/test-u32-conv-to-enc.c tests/uniconv/test-u32-strconv-from-enc.c tests/uniconv/test-u32-strconv-to-enc.c tests/uniconv/test-u8-conv-from-enc.c tests/uniconv/test-u8-conv-to-enc.c tests/uniconv/test-u8-strconv-from-enc.c tests/uniconv/test-u8-strconv-to-enc.c tests/unigbrk/test-uc-grapheme-breaks.c
diffstat 18 files changed, 39 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jan 27 12:49:12 2019 +0100
+++ b/ChangeLog	Sun Jan 27 12:24:47 2019 +0100
@@ -1,3 +1,26 @@
+2019-01-27  Bruno Haible  <bruno@clisp.org>
+
+	tests: Fix some "unused variable" warnings.
+	* tests/test-fts.c (fts_dealloc): Remove unused variable.
+	* tests/unigbrk/test-uc-grapheme-breaks.c (main): Likewise.
+	* tests/test-striconveh.c (main): Move some variable into the
+	'#if HAVE_ICONV'.
+	* tests/test-striconveha.c (main): Likewise.
+	* tests/uniconv/test-u8-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u8-conv-to-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-conv-to-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-conv-to-enc.c (main): Likewise.
+	* tests/uniconv/test-u8-strconv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-strconv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-strconv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u8-strconv-to-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-strconv-to-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-strconv-to-enc.c (main): Likewise.
+	* tests/test-tsearch.c (main): Move some variable into the
+	'#if HAVE_INITSTATE'.
+
 2019-01-27  Bruno Haible  <bruno@clisp.org>
 
 	unigbrk/uc-grapheme-breaks: Fix build failure.
--- a/tests/test-fts.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/test-fts.c	Sun Jan 27 12:24:47 2019 +0100
@@ -44,7 +44,6 @@
 {
   static char dir[] = "./";
   static char *const curr_dir[2] = { dir, 0 };
-  FTSENT *e;
   FTS *ftsp = fts_open (curr_dir, FTS_NOSTAT | FTS_PHYSICAL | FTS_CWDFD, 0);
   if (ftsp)
     {
--- a/tests/test-striconveh.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/test-striconveh.c	Sun Jan 27 12:24:47 2019 +0100
@@ -44,6 +44,7 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t indirect;
@@ -51,7 +52,6 @@
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
   iconv_t cd_ascii_to_88591 = iconv_open ("ISO-8859-1", "ASCII");
--- a/tests/test-striconveha.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/test-striconveha.c	Sun Jan 27 12:24:47 2019 +0100
@@ -45,13 +45,13 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/test-tsearch.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/test-tsearch.c	Sun Jan 27 12:24:47 2019 +0100
@@ -264,11 +264,12 @@
 main (int argc, char **argv)
 {
   int total_error = 0;
-  static char state[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
   void *root = NULL;
   int i, j;
 
 #if HAVE_INITSTATE
+  static char state[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+
   initstate (SEED, state, 8);
 #endif
 
--- a/tests/uniconv/test-u16-conv-from-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u16-conv-from-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -41,13 +41,13 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u16-conv-to-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u16-conv-to-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -40,13 +40,13 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u16-strconv-from-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u16-strconv-from-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -29,11 +29,11 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u16-strconv-to-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u16-strconv-to-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -29,11 +29,11 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u32-conv-from-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u32-conv-from-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -41,13 +41,13 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u32-conv-to-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u32-conv-to-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -40,13 +40,13 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u32-strconv-from-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u32-strconv-from-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -29,11 +29,11 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u32-strconv-to-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u32-strconv-to-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -28,11 +28,11 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u8-conv-from-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u8-conv-from-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -41,13 +41,13 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u8-conv-to-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u8-conv-to-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -41,13 +41,13 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
   size_t o;
   size_t i;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u8-strconv-from-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u8-strconv-from-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -29,11 +29,11 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/uniconv/test-u8-strconv-to-enc.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/uniconv/test-u8-strconv-to-enc.c	Sun Jan 27 12:24:47 2019 +0100
@@ -29,11 +29,11 @@
 int
 main ()
 {
+#if HAVE_ICONV
   static enum iconv_ilseq_handler handlers[] =
     { iconveh_error, iconveh_question_mark, iconveh_escape_sequence };
   size_t h;
 
-#if HAVE_ICONV
   /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1,
      ISO-8859-2, and UTF-8.  */
 
--- a/tests/unigbrk/test-uc-grapheme-breaks.c	Sun Jan 27 12:49:12 2019 +0100
+++ b/tests/unigbrk/test-uc-grapheme-breaks.c	Sun Jan 27 12:24:47 2019 +0100
@@ -139,8 +139,6 @@
       p = line;
       do
         {
-          ucs4_t next;
-
           p += strspn (p, " \t\r\n");
           if (!strncmp (p, "\303\267" /* รท */, 2))
             {