/bin/ksh can't handle a for-loop with no arguments, so add a "." for when

2008-02-09  Matthias Clasen <mclasen@redhat.com>

        * Makefile.decl: /bin/ksh can't handle a for-loop with no
        arguments, so add a "." for when $(SUBDIRS) is empty.

        * glib/tests/option-context.c:
        * glib/tests/testing.c:
        * gthread/gthread-posix.c:
        * tets/testingbase64.c:
        * glib/gtester.c:
        * glib/gsequence.c: Portability fixes.  (#515154)

svn path=/trunk/; revision=6487

diff --git a/ChangeLog b/ChangeLog
index 456be176410297a278d503e5b44d175d0e7b5d0d..134f328bafb8038e2f8bcbace569ad126b09c3b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-09  Matthias Clasen <mclasen@redhat.com>
+
+       * Makefile.decl: /bin/ksh can't handle a for-loop with no 
+       arguments, so add a "." for when $(SUBDIRS) is empty.
+
+       * glib/tests/option-context.c:
+       * glib/tests/testing.c:
+       * gthread/gthread-posix.c:
+       * tets/testingbase64.c:
+       * glib/gtester.c: 
+       * glib/gsequence.c: Portability fixes.  (#515154)
+
 2008-02-07  Tor Lillqvist  <tml@novell.com>
 
        * configure.in: Unfortunately the mingw implementations of

diff --git a/Makefile.decl b/Makefile.decl
index c86d1fcf263addb59d25dbcb51b4a2b547d1fdcb..e7ca0d0567e257bdbeb1b7956b87b0e0d55ff513 100644 (file)
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -13,7 +13,7 @@ TEST_PROGS =
 # test: run all tests in cwd and subdirs
 test:  ${TEST_PROGS}
        @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-       @ for subdir in $(SUBDIRS) ; do \
+       @ for subdir in $(SUBDIRS) . ; do \
            test "$$subdir" = "." -o "$$subdir" = "po" || \
            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
          done
@@ -38,7 +38,7 @@ test-report perf-report full-report:  ${TEST_PROGS}
            GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
            ignore_logdir=false ; \
          fi ; \
-         for subdir in $(SUBDIRS) ; do \
+         for subdir in $(SUBDIRS) . ; do \
            test "$$subdir" = "." -o "$$subdir" = "po" || \
            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
          done ; \

diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c
index ad00c69f2f000ce8a35da34ad2c3c2bc93c811aa..e1bf860516c7c210ea1b208dadef261ae6449d00 100644 (file)
--- a/gio/gbufferedinputstream.c
+++ b/gio/gbufferedinputstream.c
@@ -481,7 +481,7 @@ g_buffered_input_stream_fill_async (GBufferedInputStream *stream,
                                           user_data,
                                           G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
                                           _("Too large count value passed to %s"),
-                                          __FUNCTION__);
+                                          G_STRFUNC);
       return;
     }
   

diff --git a/gio/ginputstream.c b/gio/ginputstream.c
index 3e4d24cb59c0037bdd0a9445c3b1feb962adcb8a..edc5d8c65ab5b89d36d8f776ebe30a94065170c2 100644 (file)
--- a/gio/ginputstream.c
+++ b/gio/ginputstream.c
@@ -183,7 +183,7 @@ g_input_stream_read  (GInputStream  *stream,
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                  _("Too large count value passed to %s"), __FUNCTION__);
+                  _("Too large count value passed to %s"), G_STRFUNC);
       return -1;
     }
 
@@ -315,7 +315,7 @@ g_input_stream_skip (GInputStream  *stream,
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                  _("Too large count value passed to %s"), __FUNCTION__);
+                  _("Too large count value passed to %s"), G_STRFUNC);
       return -1;
     }
   
@@ -557,7 +557,7 @@ g_input_stream_read_async (GInputStream        *stream,
                                           user_data,
                                           G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
                                           _("Too large count value passed to %s"),
-                                          __FUNCTION__);
+                                          G_STRFUNC);
       return;
     }
 
@@ -682,7 +682,7 @@ g_input_stream_skip_async (GInputStream        *stream,
                                           user_data,
                                           G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
                                           _("Too large count value passed to %s"),
-                                          __FUNCTION__);
+                                          G_STRFUNC);
       return;
     }
 

diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index 6f8a95c10620acd80378f5fcedcaf74c28a157ee..6ed859a1e2f15107d03f38b121b2b7aeeb853e83 100644 (file)
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -190,7 +190,7 @@ g_output_stream_write (GOutputStream  *stream,
   if (((gssize) count) < 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                  _("Too large count value passed to %s"), __FUNCTION__);
+                  _("Too large count value passed to %s"), G_STRFUNC);
       return -1;
     }
 
@@ -645,7 +645,7 @@ g_output_stream_write_async (GOutputStream       *stream,
                                           user_data,
                                           G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
                                           _("Too large count value passed to %s"),
-                                          __FUNCTION__);
+                                          G_STRFUNC);
       return;
     }
 

diff --git a/gio/tests/data-input-stream.c b/gio/tests/data-input-stream.c
index 75ed38c4484b2a7cf7c0943c5c3144ec3a6cff13..6abc7c471eb57b13c40a1ba443f5a3ae06904e04 100644 (file)
--- a/gio/tests/data-input-stream.c
+++ b/gio/tests/data-input-stream.c
@@ -128,9 +128,9 @@ test_read_until (void)
   int line;
   int i;
   
-#define REPEATS                        10   //  number of rounds
+#define REPEATS                        10   /* number of rounds */
 #define DATA_STRING            " part1 # part2 $ part3 % part4 ^"
-#define DATA_PART_LEN  7    //  number of characters between separators
+#define DATA_PART_LEN          7    /* number of characters between separators */
 #define DATA_SEP               "#$%^"
   const int DATA_PARTS_NUM = strlen (DATA_SEP) * REPEATS;
   
@@ -262,7 +262,7 @@ test_data_array (GInputStream *stream, GInputStream *base_stream,
          break;
        }
       if ((data) && (! error))  
-       g_assert_cmpint (data, ==, TEST_DATA_RETYPE_BUFF(data_type, (buffer + pos)));
+       g_assert_cmpint (data, ==, TEST_DATA_RETYPE_BUFF(data_type, ((guchar*)buffer + pos)));
       
       pos += data_size;
     }
@@ -289,7 +289,7 @@ test_read_int (void)
       guchar x = 0;
       while (! x)
        x = (guchar)g_rand_int (rand);
-      *(guchar*)(buffer + sizeof(guchar) * i) = x; 
+      *(guchar*)((guchar*)buffer + sizeof(guchar) * i) = x; 
     }
 
   base_stream = g_memory_input_stream_new ();

diff --git a/gio/tests/data-output-stream.c b/gio/tests/data-output-stream.c
index 876511afbe4870eadd4b6e84b2df4655439bc022..4917b6b7e074fe77269eb442dff414f5ed2ec813 100644 (file)
--- a/gio/tests/data-output-stream.c
+++ b/gio/tests/data-output-stream.c
@@ -37,6 +37,7 @@ test_read_lines (GDataStreamNewlineType newline_type)
   GError *error = NULL;
   gpointer data;
   char *lines;
+  int size;
   int i;
   int size;
 
@@ -71,7 +72,7 @@ test_read_lines (GDataStreamNewlineType newline_type)
   g_assert_cmpint (g_data_output_stream_get_byte_order (G_DATA_OUTPUT_STREAM (stream)), ==, G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN);
   
   /*  compare data */
-  size = strlen(data);
+  size = strlen (data);
   g_assert_cmpint (size, <, MAX_LINES_BUFF);
   g_assert_cmpstr ((char*)data, ==, lines);
   
@@ -184,25 +185,25 @@ test_data_array (gpointer buffer, int len,
       switch (data_type)
        {
        case TEST_DATA_BYTE:
-         res = g_data_output_stream_put_byte (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, (buffer + pos)), NULL, &error);
+         res = g_data_output_stream_put_byte (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, ((guchar*)buffer + pos)), NULL, &error);
          break;
        case TEST_DATA_INT16:
-         res = g_data_output_stream_put_int16 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, (buffer + pos)), NULL, &error);
+         res = g_data_output_stream_put_int16 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, ((guchar*)buffer + pos)), NULL, &error);
          break;
        case TEST_DATA_UINT16:
-         res = g_data_output_stream_put_uint16 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, (buffer + pos)), NULL, &error);
+         res = g_data_output_stream_put_uint16 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, ((guchar*)buffer + pos)), NULL, &error);
          break;
        case TEST_DATA_INT32:
-         res = g_data_output_stream_put_int32 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, (buffer + pos)), NULL, &error);
+         res = g_data_output_stream_put_int32 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, ((guchar*)buffer + pos)), NULL, &error);
          break;
        case TEST_DATA_UINT32:
-         res = g_data_output_stream_put_uint32 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, (buffer + pos)), NULL, &error);
+         res = g_data_output_stream_put_uint32 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, ((guchar*)buffer + pos)), NULL, &error);
          break;
        case TEST_DATA_INT64:
-         res = g_data_output_stream_put_int64 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, (buffer + pos)), NULL, &error);
+         res = g_data_output_stream_put_int64 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, ((guchar*)buffer + pos)), NULL, &error);
          break;
        case TEST_DATA_UINT64:
-         res = g_data_output_stream_put_uint64 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, (buffer + pos)), NULL, &error);
+         res = g_data_output_stream_put_uint64 (G_DATA_OUTPUT_STREAM (stream), TEST_DATA_RETYPE_BUFF (data_type, ((guchar*)buffer + pos)), NULL, &error);
          break;
        }
       g_assert (error == NULL);
@@ -216,7 +217,7 @@ test_data_array (gpointer buffer, int len,
   data = 0;
   while (pos < len)
     {
-      data = TEST_DATA_RETYPE_BUFF(data_type, (stream_data + pos));
+      data = TEST_DATA_RETYPE_BUFF(data_type, ((guchar*)stream_data + pos));
       if (swap)
        {
          switch (data_type)
@@ -237,7 +238,7 @@ test_data_array (gpointer buffer, int len,
              break;
            }
        }
-      g_assert_cmpint (data, ==, TEST_DATA_RETYPE_BUFF(data_type, (buffer + pos)));
+      g_assert_cmpint (data, ==, TEST_DATA_RETYPE_BUFF(data_type, ((guchar*)buffer + pos)));
       break;
       
       pos += data_size;
@@ -263,7 +264,7 @@ test_read_int (void)
     {
       guchar x = 0;
       while (! x)  x = (guchar)g_rand_int (rand);
-      *(guchar*)(buffer + sizeof(guchar) * i) = x; 
+      *(guchar*)((guchar*)buffer + sizeof (guchar) * i) = x; 
     }
 
   for (i = 0; i < 3; i++)

diff --git a/glib/gsequence.c b/glib/gsequence.c
index 928ee4d55a9b231da899fd1e371362408520e6b9..fb64658b6729d3e6d501a1569734bceb042e2bb2 100644 (file)
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -589,7 +589,11 @@ g_sequence_sort (GSequence        *seq,
                  GCompareDataFunc  cmp_func,
                  gpointer          cmp_data)
 {
-  SortInfo info = { cmp_func, cmp_data, seq->end_node };
+  SortInfo info;
+
+  info.cmp_func = cmp_func;
+  info.cmp_data = cmp_data;
+  info.end_node = seq->end_node;
   
   check_seq_access (seq);
   
@@ -621,11 +625,13 @@ g_sequence_insert_sorted (GSequence        *seq,
                           GCompareDataFunc  cmp_func,
                           gpointer          cmp_data)
 {
-  SortInfo info = { cmp_func, cmp_data, NULL };
-  
+  SortInfo info;
+
   g_return_val_if_fail (seq != NULL, NULL);
   g_return_val_if_fail (cmp_func != NULL, NULL);
   
+  info.cmp_func = cmp_func;
+  info.cmp_data = cmp_data;
   info.end_node = seq->end_node;
   check_seq_access (seq);
   
@@ -654,10 +660,12 @@ g_sequence_sort_changed (GSequenceIter    *iter,
                          GCompareDataFunc  cmp_func,
                          gpointer          cmp_data)
 {
-  SortInfo info = { cmp_func, cmp_data, NULL };
-  
+  SortInfo info;
+
   g_return_if_fail (!is_end (iter));
   
+  info.cmp_func = cmp_func;
+  info.cmp_data = cmp_data;
   info.end_node = get_sequence (iter)->end_node;
   check_iter_access (iter);
   
@@ -689,10 +697,12 @@ g_sequence_search (GSequence        *seq,
                    GCompareDataFunc  cmp_func,
                    gpointer          cmp_data)
 {
-  SortInfo info = { cmp_func, cmp_data, NULL };
-  
+  SortInfo info;
+
   g_return_val_if_fail (seq != NULL, NULL);
   
+  info.cmp_func = cmp_func;
+  info.cmp_data = cmp_data;
   info.end_node = seq->end_node;
   check_seq_access (seq);
   

diff --git a/glib/gtester.c b/glib/gtester.c
index e774a9df946244862a4f6bbc414d07678f74b0a1..8fae5a137d48fda77598608c348d55a5d87971cb 100644 (file)
--- a/glib/gtester.c
+++ b/glib/gtester.c
@@ -273,7 +273,7 @@ launch_test_binary (const char *binary,
   GTestLogBuffer *tlb;
   GSList *slist, *free_list = NULL;
   GError *error = NULL;
-  const gchar *argv[99 + g_slist_length (subtest_args) + g_slist_length (subtest_paths)];
+  const gchar *argv[ARG_MAX];
   GPid pid = 0;
   gint report_pipe[2] = { -1, -1 };
   guint child_report_cb_id = 0;
@@ -293,7 +293,7 @@ launch_test_binary (const char *binary,
   argv[i++] = binary;
   for (slist = subtest_args; slist; slist = slist->next)
     argv[i++] = (gchar*) slist->data;
-  // argv[i++] = "--debug-log";
+  /* argv[i++] = "--debug-log"; */
   if (subtest_quiet)
     argv[i++] = "--quiet";
   if (subtest_verbose)

diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c
index 685e3dd237ed48071d8df961ee0a9f1b8baedd0c..29b9991ed35ba9aa578c3f91e673093070c4fe4e 100644 (file)
--- a/glib/tests/option-context.c
+++ b/glib/tests/option-context.c
@@ -71,7 +71,11 @@ group_captions (void)
 
       for (j = 0; j < G_N_ELEMENTS (help_variants); ++j)
         {
-          gchar *args[] = { __FILE__, help_variants[j], NULL };
+          gchar *args[3];
+
+          args[0] = __FILE__;
+          args[1] = help_variants[j];
+          args[2] = NULL;
 
           g_test_message ("test setup: args='%s', main-entries=%d, test-entries=%d",
                           args[1], have_main_entries, have_test_entries);

diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index d43dc556e8bc1d0eedff454120da2a12fa6f0c7a..b73f2cfe3a52e28e93852fc159c12a6c8cc77c9c 100644 (file)
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -57,7 +57,7 @@ test_timer (void)
   g_assert_cmpfloat (ttime, >, 0);
   g_assert_cmpfloat (g_test_timer_last(), ==, ttime);
   g_test_minimized_result (ttime, "timer-test-time: %fsec", ttime);
-  g_test_maximized_result (5, "bogus-quantity: %ddummies", 5); // simple API test
+  g_test_maximized_result (5, "bogus-quantity: %ddummies", 5); /* simple API test */
 }
 
 /* fork out for a failing test */

diff --git a/gthread/gthread-posix.c b/gthread/gthread-posix.c
index 0891bf2bd22d10a315b8437154268e92be221fe1..9188f843e27ba5de369a2a2299bab20b11aed39a 100644 (file)
--- a/gthread/gthread-posix.c
+++ b/gthread/gthread-posix.c
@@ -51,7 +51,7 @@
   int error = (err);                                                   \
   if (error)                                                           \
     g_error ("file %s: line %d (%s): error '%s' during '%s'",          \
-           __FILE__, __LINE__, __FUNCTION__,                           \
+           __FILE__, __LINE__, G_STRFUNC,                              \
            g_strerror (error), name);                                  \
   }G_STMT_END
 

diff --git a/tests/testingbase64.c b/tests/testingbase64.c
index 8b7303a27346eec603fd9fc46608c4f55e272b8e..ccf2332743e327a853c4a4cf789e13a69f1d2cd9 100644 (file)
--- a/tests/testingbase64.c
+++ b/tests/testingbase64.c
@@ -163,7 +163,7 @@ test_base64_encode (void)
       length = i + 1;
       text = g_base64_encode (myraw.data, length);
       g_assert_cmpstr (text, ==, ok_100_encode_strs[i]);
-      //      printf ("\"%s\",\n",text);
+      /* printf ("\"%s\",\n",text); */
       g_free (text);
     }
 }
@@ -179,7 +179,7 @@ decode_and_compare (const gchar            *datap,
 
   data2 = g_base64_decode (datap, &len);
   g_assert_cmpint (len, ==, p->length);
-  //      g_print ("length: got %d, expected %d\n",len, length);
+  /* g_print ("length: got %d, expected %d\n",len, length); */
   memcmp_decode = memcmp (p->data, data2, p->length);
   g_assert_cmpint (memcmp_decode, ==, 0);
   g_free (data2);