Fix C99isms. (#324950, Dan Yefimov)

2005-12-25  Matthias Clasen  <mclasen@redhat.com>

        * tests/slice-test.c: Fix C99isms.  (#324950, Dan Yefimov)

diff --git a/ChangeLog b/ChangeLog
index 317ccc343797f4f25707442e33117e9ed044ad2b..58199c303f89e501f28ebd0ba0c988f8bff1b802 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/slice-test.c: Fix C99isms.  (#324950, Dan Yefimov)
+
 2005-12-21  Matthias Clasen  <mclasen@redhat.com>
        
        * README.in: Add some notes on when 'make check' may fail.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 317ccc343797f4f25707442e33117e9ed044ad2b..58199c303f89e501f28ebd0ba0c988f8bff1b802 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-12-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/slice-test.c: Fix C99isms.  (#324950, Dan Yefimov)
+
 2005-12-21  Matthias Clasen  <mclasen@redhat.com>
        
        * README.in: Add some notes on when 'make check' may fail.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 317ccc343797f4f25707442e33117e9ed044ad2b..58199c303f89e501f28ebd0ba0c988f8bff1b802 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2005-12-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/slice-test.c: Fix C99isms.  (#324950, Dan Yefimov)
+
 2005-12-21  Matthias Clasen  <mclasen@redhat.com>
        
        * README.in: Add some notes on when 'make check' may fail.

diff --git a/tests/slice-test.c b/tests/slice-test.c
index f0b5b20af3131ac0be6be0f33b86afcead7c329c..1390efccc8748897434d3e8d5e05033239335ab4 100644 (file)
--- a/tests/slice-test.c
+++ b/tests/slice-test.c
@@ -70,6 +70,10 @@ memchunk_free (GMemChunk *memchunk,
 static gpointer
 test_memchunk_thread (gpointer data)
 {
+  GMemChunk **memchunks;
+  guint i, j;
+  guint8 **ps;
+  guint   *ss;
   guint32 rand_accu = 2147483563;
   /* initialize random numbers */
   if (data)
@@ -82,12 +86,11 @@ test_memchunk_thread (gpointer data)
     }
 
   /* prepare for memchunk creation */
-  GMemChunk **memchunks = g_alloca (sizeof (memchunks[0]) * prime_size);
+  memchunks = g_alloca (sizeof (memchunks[0]) * prime_size);
   memset (memchunks, 0, sizeof (memchunks[0]) * prime_size);
 
-  guint i, j;
-  guint8 **ps = g_new (guint8*, number_of_blocks);
-  guint   *ss = g_new (guint, number_of_blocks);
+  ps = g_new (guint8*, number_of_blocks);
+  ss = g_new (guint, number_of_blocks);
   /* create number_of_blocks random sizes */
   for (i = 0; i < number_of_blocks; i++)
     ss[i] = quick_rand32() % prime_size;