From c53134b57c7786bbadd752ce246d2631031e7c23 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 21 Dec 2007 13:58:42 +0000 Subject: [PATCH] Bring up to GLib coding standards: remove C99 comments, trailing commas in 2007-12-21 Matthias Clasen * glib/gtestutils.h: Bring up to GLib coding standards: remove C99 comments, trailing commas in enumerations and extra ; after G_BEGIN/END_DECLS. Among other things, this makes xulrunner build against GLib 2.15. * glib/gtester.c: More of the same svn path=/trunk/; revision=6185 --- ChangeLog | 9 +++++++++ glib/gtester.c | 8 ++++---- glib/gtestutils.h | 30 +++++++++++++++--------------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 959849a89..b1b26c8cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-12-21 Matthias Clasen + + * glib/gtestutils.h: Bring up to GLib coding standards: remove + C99 comments, trailing commas in enumerations and extra ; after + G_BEGIN/END_DECLS. Among other things, this makes xulrunner build + against GLib 2.15. + + * glib/gtester.c: More of the same + 2007-12-09 Hans Breuer * tests/gio-ls.c : adapt to recent api changes diff --git a/glib/gtester.c b/glib/gtester.c index ac91ef199..e774a9df9 100644 --- a/glib/gtester.c +++ b/glib/gtester.c @@ -156,7 +156,7 @@ test_log_msg (GTestLogMsg *msg) log_indent += 2; break; case G_TEST_LOG_SKIP_CASE: - if (FALSE && gtester_verbose) // enable to debug test case skipping logic + if (FALSE && gtester_verbose) /* enable to debug test case skipping logic */ { gchar *sc = g_strconcat (msg->strings[0], ":", NULL); gchar *sleft = g_strdup_printf ("%-68s", sc); @@ -224,7 +224,7 @@ child_report_cb (GIOChannel *source, (void) status; } while (length > 0); - // g_print ("LASTIOSTATE: first_read_eof=%d condition=%d\n", first_read_eof, condition); + /* g_print ("LASTIOSTATE: first_read_eof=%d condition=%d\n", first_read_eof, condition); */ if (first_read_eof || (condition & (G_IO_ERR | G_IO_HUP))) { /* if there's no data to read and select() reports an error or hangup, @@ -365,7 +365,7 @@ launch_test_binary (const char *binary, subtest_io_pending || /* FALSE once ioc_report closes */ loop_pending) /* TRUE while idler, etc are running */ { - // g_print ("LOOPSTATE: subtest_running=%d subtest_io_pending=%d\n", subtest_running, subtest_io_pending); + /* g_print ("LOOPSTATE: subtest_running=%d subtest_io_pending=%d\n", subtest_running, subtest_io_pending); */ /* check for unexpected hangs that are not signalled on report_pipe */ if (!subtest_running && /* child exited */ subtest_io_pending && /* no EOF detected on report_pipe */ @@ -468,7 +468,7 @@ parse_args (gint *argc_p, { gtester_selftest = TRUE; argv[i] = NULL; - break; // stop parsing regular gtester arguments + break; /* stop parsing regular gtester arguments */ } else if (strcmp (argv[i], "-h") == 0 || strcmp (argv[i], "--help") == 0) { diff --git a/glib/gtestutils.h b/glib/gtestutils.h index ce055e8cd..8646a8951 100644 --- a/glib/gtestutils.h +++ b/glib/gtestutils.h @@ -22,7 +22,7 @@ #include -G_BEGIN_DECLS; +G_BEGIN_DECLS typedef struct GTestCase GTestCase; typedef struct GTestSuite GTestSuite; @@ -105,8 +105,8 @@ void g_test_bug_base (const char *uri_pattern); void g_test_bug (const char *bug_uri_snippet); /* measure test timings */ void g_test_timer_start (void); -double g_test_timer_elapsed (void); // elapsed seconds -double g_test_timer_last (void); // repeat last elapsed() result +double g_test_timer_elapsed (void); /* elapsed seconds */ +double g_test_timer_last (void); /* repeat last elapsed() result */ /* automatically g_free or g_object_unref upon teardown */ void g_test_queue_free (gpointer gfree_pointer); @@ -118,7 +118,7 @@ void g_test_queue_destroy (GDestroyNotify destroy_func, typedef enum { G_TEST_TRAP_SILENCE_STDOUT = 1 << 7, G_TEST_TRAP_SILENCE_STDERR = 1 << 8, - G_TEST_TRAP_INHERIT_STDIN = 1 << 9, + G_TEST_TRAP_INHERIT_STDIN = 1 << 9 } GTestTrapFlags; gboolean g_test_trap_fork (guint64 usec_timeout, GTestTrapFlags test_trap_flags); @@ -207,21 +207,21 @@ GLIB_VAR const GTestConfig * const g_test_config_vars; /* internal logging API */ typedef enum { G_TEST_LOG_NONE, - G_TEST_LOG_ERROR, // s:msg - G_TEST_LOG_START_BINARY, // s:binaryname s:seed - G_TEST_LOG_LIST_CASE, // s:testpath - G_TEST_LOG_SKIP_CASE, // s:testpath - G_TEST_LOG_START_CASE, // s:testpath - G_TEST_LOG_STOP_CASE, // d:status d:nforks d:elapsed - G_TEST_LOG_MIN_RESULT, // s:blurb d:result - G_TEST_LOG_MAX_RESULT, // s:blurb d:result - G_TEST_LOG_MESSAGE, // s:blurb + G_TEST_LOG_ERROR, /* s:msg */ + G_TEST_LOG_START_BINARY, /* s:binaryname s:seed */ + G_TEST_LOG_LIST_CASE, /* s:testpath */ + G_TEST_LOG_SKIP_CASE, /* s:testpath */ + G_TEST_LOG_START_CASE, /* s:testpath */ + G_TEST_LOG_STOP_CASE, /* d:status d:nforks d:elapsed */ + G_TEST_LOG_MIN_RESULT, /* s:blurb d:result */ + G_TEST_LOG_MAX_RESULT, /* s:blurb d:result */ + G_TEST_LOG_MESSAGE /* s:blurb */ } GTestLogType; typedef struct { GTestLogType log_type; guint n_strings; - gchar **strings; // NULL terminated + gchar **strings; /* NULL terminated */ guint n_nums; long double *nums; } GTestLogMsg; @@ -240,6 +240,6 @@ void g_test_log_buffer_push (GTestLogBuffer *tbuffer, GTestLogMsg* g_test_log_buffer_pop (GTestLogBuffer *tbuffer); void g_test_log_msg_free (GTestLogMsg *tmsg); -G_END_DECLS; +G_END_DECLS #endif /* __G_TEST_UTILS_H__ */