Changeset 5ebff60 for tests/check.c

Timestamp:

2015-02-20T22:50:54Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0b9daac, 3d45471, 7733b8c

Parents:

af359b4

git-author:

Indent <please@…> (19-02-15 05:47:20)

git-committer:

dequis <dx@…> (20-02-15 22:50:54)

Message:

Reindent everything to K&R style with tabs

Used uncrustify, with the configuration file in ./doc/uncrustify.cfg

Commit author set to "Indent <please@…>" so that it's easier to
skip while doing git blame.

File:

• tests/check.c (modified) (8 diffs)

tests/check.c

@@ -8 +8 @@
 #include "testsuite.h"
 
-global_t global;        /* Against global namespace pollution */
+global_t global;        /* Against global namespace pollution */
 
 gboolean g_io_channel_pair(GIOChannel **ch1, GIOChannel **ch2)
 {
         int sock[2];
+
         if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNIX, sock) < 0) {
                 perror("socketpair");
@@ -27 +28 @@
         irc_t *irc;
         GIOChannel *ch1, *ch2;
-        if (!g_io_channel_pair(&ch1, &ch2))
+
+        if (!g_io_channel_pair(&ch1, &ch2)) {
                 return NULL;
+        }
         irc = irc_new(g_io_channel_unix_get_fd(ch1));
         return irc;
@@ -37 +40 @@
         struct timeval time[1];
 
-        gettimeofday( time, 0 );
-        return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
+        gettimeofday(time, 0);
+        return((double) time->tv_sec + (double) time->tv_usec / 1000000);
 }
 
@@ -71 +74 @@
 Suite *jabber_util_suite(void);
 
-int main (int argc, char **argv)
+int main(int argc, char **argv)
 {
         int nf;
@@ -79 +82 @@
         gboolean verbose = FALSE;
         GOptionEntry options[] = {
-                {"no-fork", 'n', 0, G_OPTION_ARG_NONE, &no_fork, "Don't fork" },
-                {"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL },
+                { "no-fork", 'n', 0, G_OPTION_ARG_NONE, &no_fork, "Don't fork" },
+                { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL },
                 { NULL }
         };
@@ -87 +90 @@
         g_option_context_add_main_entries(pc, options, NULL);
 
-        if(!g_option_context_parse(pc, &argc, &argv, NULL))
+        if (!g_option_context_parse(pc, &argc, &argv, NULL)) {
                 return 1;
+        }
 
         g_option_context_free(pc);
@@ -97 +101 @@
 
         if (verbose) {
-                log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
 #ifdef DEBUG
-                log_link( LOGLVL_DEBUG, LOGOUTPUT_CONSOLE );
+                log_link(LOGLVL_DEBUG, LOGOUTPUT_CONSOLE);
 #endif
-                log_link( LOGLVL_INFO, LOGOUTPUT_CONSOLE );
-                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
+                log_link(LOGLVL_INFO, LOGOUTPUT_CONSOLE);
+                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
         }
 
-        global.conf = conf_load( 0, NULL);
+        global.conf = conf_load(0, NULL);
         global.conf->runmode = RUNMODE_DAEMON;
 
@@ -118 +122 @@
         srunner_add_suite(sr, jabber_sasl_suite());
         srunner_add_suite(sr, jabber_util_suite());
-        if (no_fork)
+        if (no_fork) {
                 srunner_set_fork_status(sr, CK_NOFORK);
-        srunner_run_all (sr, verbose?CK_VERBOSE:CK_NORMAL);
+        }
+        srunner_run_all(sr, verbose ? CK_VERBOSE : CK_NORMAL);
         nf = srunner_ntests_failed(sr);
         srunner_free(sr);