Code

src/oping.c: Coding style fixes.
authorFlorian Forster <ff@octo.it>
Mon, 20 Mar 2017 07:09:20 +0000 (08:09 +0100)
committerFlorian Forster <ff@octo.it>
Mon, 20 Mar 2017 07:09:20 +0000 (08:09 +0100)
This also removes a "for loop initial declaration" which GCC complains
about when not in C99 mode. *sigh*

src/oping.c

index fc2bd659e42fc631f17f70f8b3cf3b75f189060a..e3cb69633cf86f9bf81e9d754165dc8f292de488 100644 (file)
@@ -296,7 +296,7 @@ static void clean_history (ping_context_t *ctx) /* {{{ */
        /* Remove impossible values caused by adding a new host */
        for (i = 0; i < ctx->history_size; i++)
                if (ctx->history_by_value[i] < 0)
-                       ctx->history_by_value[i]=NAN;
+                       ctx->history_by_value[i] = NAN;
 
        /* Sort all RTTs. */
        qsort (ctx->history_by_value, ctx->history_size, sizeof
@@ -414,11 +414,13 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */
        {
                ping_context_t *context;
                size_t buffer_size;
+               int i;
 
                context = ping_iterator_get_context(iter);
 
                /* if this is a previously existing host, do not recreate it */
-               if (context != NULL) {
+               if (context != NULL)
+               {
                        history_size = context->history_size;
                        context->index = index++;
                        continue;
@@ -430,9 +432,8 @@ static int ping_initialize_contexts (pingobj_t *ping) /* {{{ */
                /* start new hosts at the same graph point as old hosts */
                context->history_size = history_size;
                context->history_index = history_size;
-               for (int i = 0; i < history_size; i++) {
+               for (i = 0; i < history_size; i++)
                        context->history_by_time[i] = -1;
-               }
 
                buffer_size = sizeof (context->host);
                ping_iterator_get_info (iter, PING_INFO_HOSTNAME, context->host, &buffer_size);
@@ -1356,10 +1357,10 @@ static int check_resize (pingobj_t *ping) /* {{{ */
                {
                        char host[NI_MAXHOST];
 
-                       wprintw(main_win, "New Host: ");
-                       echo();
-                       wgetnstr(main_win, host, sizeof(host));
-                       noecho();
+                       wprintw (main_win, "New Host: ");
+                       echo ();
+                       wgetnstr (main_win, host, sizeof (host));
+                       noecho ();
 
                        if (ping_host_add(ping, host) < 0)
                        {
@@ -1369,9 +1370,8 @@ static int check_resize (pingobj_t *ping) /* {{{ */
                        }
                        else
                        {
-                               /* FIXME - scroll main_win correctly so that
-                                       old data is still visible */
-
+                               /* FIXME - scroll main_win correctly so that old
+                                * data is still visible */
                                need_resize = 1;
                                host_num++;
                                ping_initialize_contexts(ping);