glib r6487 - in trunk: . gio gio/tests glib glib/tests gthread tests
- From: matthiasc svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r6487 - in trunk: . gio gio/tests glib glib/tests gthread tests
- Date: Sun, 10 Feb 2008 04:41:25 +0000 (GMT)
Author: matthiasc
Date: Sun Feb 10 04:41:25 2008
New Revision: 6487
URL: http://svn.gnome.org/viewvc/glib?rev=6487&view=rev
Log:
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)
Modified:
trunk/ChangeLog
trunk/Makefile.decl
trunk/gio/gbufferedinputstream.c
trunk/gio/ginputstream.c
trunk/gio/goutputstream.c
trunk/gio/tests/data-input-stream.c
trunk/gio/tests/data-output-stream.c
trunk/glib/gsequence.c
trunk/glib/gtester.c
trunk/glib/tests/option-context.c
trunk/glib/tests/testing.c
trunk/gthread/gthread-posix.c
trunk/tests/testingbase64.c
Modified: trunk/Makefile.decl
==============================================================================
--- trunk/Makefile.decl (original)
+++ trunk/Makefile.decl Sun Feb 10 04:41:25 2008
@@ -13,7 +13,7 @@
# 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 @@
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 ; \
Modified: trunk/gio/gbufferedinputstream.c
==============================================================================
--- trunk/gio/gbufferedinputstream.c (original)
+++ trunk/gio/gbufferedinputstream.c Sun Feb 10 04:41:25 2008
@@ -481,7 +481,7 @@
user_data,
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Too large count value passed to %s"),
- __FUNCTION__);
+ G_STRFUNC);
return;
}
Modified: trunk/gio/ginputstream.c
==============================================================================
--- trunk/gio/ginputstream.c (original)
+++ trunk/gio/ginputstream.c Sun Feb 10 04:41:25 2008
@@ -183,7 +183,7 @@
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 @@
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 @@
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 @@
user_data,
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Too large count value passed to %s"),
- __FUNCTION__);
+ G_STRFUNC);
return;
}
Modified: trunk/gio/goutputstream.c
==============================================================================
--- trunk/gio/goutputstream.c (original)
+++ trunk/gio/goutputstream.c Sun Feb 10 04:41:25 2008
@@ -190,7 +190,7 @@
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 @@
user_data,
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Too large count value passed to %s"),
- __FUNCTION__);
+ G_STRFUNC);
return;
}
Modified: trunk/gio/tests/data-input-stream.c
==============================================================================
--- trunk/gio/tests/data-input-stream.c (original)
+++ trunk/gio/tests/data-input-stream.c Sun Feb 10 04:41:25 2008
@@ -128,9 +128,9 @@
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 @@
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 @@
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 ();
Modified: trunk/gio/tests/data-output-stream.c
==============================================================================
--- trunk/gio/tests/data-output-stream.c (original)
+++ trunk/gio/tests/data-output-stream.c Sun Feb 10 04:41:25 2008
@@ -37,6 +37,7 @@
GError *error = NULL;
gpointer data;
char *lines;
+ int size;
int i;
int size;
@@ -71,7 +72,7 @@
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 @@
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 @@
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 @@
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 @@
{
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++)
Modified: trunk/glib/gsequence.c
==============================================================================
--- trunk/glib/gsequence.c (original)
+++ trunk/glib/gsequence.c Sun Feb 10 04:41:25 2008
@@ -589,7 +589,11 @@
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 @@
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 @@
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 @@
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);
Modified: trunk/glib/gtester.c
==============================================================================
--- trunk/glib/gtester.c (original)
+++ trunk/glib/gtester.c Sun Feb 10 04:41:25 2008
@@ -273,7 +273,7 @@
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 @@
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)
Modified: trunk/glib/tests/option-context.c
==============================================================================
--- trunk/glib/tests/option-context.c (original)
+++ trunk/glib/tests/option-context.c Sun Feb 10 04:41:25 2008
@@ -71,7 +71,11 @@
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);
Modified: trunk/glib/tests/testing.c
==============================================================================
--- trunk/glib/tests/testing.c (original)
+++ trunk/glib/tests/testing.c Sun Feb 10 04:41:25 2008
@@ -57,7 +57,7 @@
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 */
Modified: trunk/gthread/gthread-posix.c
==============================================================================
--- trunk/gthread/gthread-posix.c (original)
+++ trunk/gthread/gthread-posix.c Sun Feb 10 04:41:25 2008
@@ -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
Modified: trunk/tests/testingbase64.c
==============================================================================
--- trunk/tests/testingbase64.c (original)
+++ trunk/tests/testingbase64.c Sun Feb 10 04:41:25 2008
@@ -163,7 +163,7 @@
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 @@
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
