formatting and portability

diff --git a/graph/adj.h b/graph/adj.h
index 2ec54a3b562a450cb4fb316edf2fa3bc20b3fa9c..86381f9179f0bd92af6e83e57eea08036748d3e2 100644 (file)
--- a/graph/adj.h
+++ b/graph/adj.h
@@ -19,7 +19,7 @@ struct edge /* probably not a good name for this */
 struct graph
 {
   struct vertex *v; /* array of vertices */
 struct graph
 {
   struct vertex *v; /* array of vertices */

-  unsigned int nv; /* number of vertices */
+  unsigned int nv;  /* number of vertices */

 };
 
 struct graph *new_graph (unsigned int nv);
 };
 
 struct graph *new_graph (unsigned int nv);

diff --git a/gt.c b/gt.c
index 0013cf940fa3073ae8deeba5d178367b792bf220..a3c112a21e9517a2853bf42bd05bb12554a73c96 100644 (file)
--- a/gt.c
+++ b/gt.c
@@ -1,10 +1,10 @@
 #define _GNU_SOURCE
 #define _GNU_SOURCE

+#include "graph/adj.h"
+#include "graph/dfs.h"
+#include "lib/dbg.h"

 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include "lib/dbg.h"
-#include "graph/adj.h"
-#include "graph/dfs.h"

 
 #define bfs dfs /* stub until tomorrow */
 
 
 #define bfs dfs /* stub until tomorrow */
 


@@ -67,11 +67,9 @@ main (int argc, char **argv)
   unsigned int nv, u, v;
   int i;
 
   unsigned int nv, u, v;
   int i;
 

-  static struct option long_opts[] = {
-    {"dfs", no_argument, 0, 'd'},
-    {"bfs", no_argument, 0, 'b'},
-    {0, 0, 0, 0}
-  };
+  static struct option long_opts[] = { { "dfs", no_argument, 0, 'd' },
+                                       { "bfs", no_argument, 0, 'b' },
+                                       { 0, 0, 0, 0 } };

 
   while ((c = getopt_long (argc, argv, "db", long_opts, NULL)) != -1)
     {
 
   while ((c = getopt_long (argc, argv, "db", long_opts, NULL)) != -1)
     {


@@ -84,7 +82,8 @@ main (int argc, char **argv)
           a = ALGO_BFS;
           break;
         default:
           a = ALGO_BFS;
           break;
         default:

-          fprintf (stderr, "Usage: %s [--dfs|--bfs] <nv> [u1 v1 ...]\n", argv[0]);
+          fprintf (stderr, "Usage: %s [--dfs|--bfs] <nv> [u1 v1 ...]\n",
+                   argv[0]);

           exit (EXIT_FAILURE);
         }
     }
           exit (EXIT_FAILURE);
         }
     }


@@ -95,14 +94,14 @@ main (int argc, char **argv)
   if (optind >= argc)
     fatal ("missing number of vertices");
 
   if (optind >= argc)
     fatal ("missing number of vertices");
 

-  nv = (unsigned int) atoi (argv[optind]);
+  nv = (unsigned int)atoi (argv[optind]);

   if (!(g = new_graph (nv)))
     fatal ("new_graph ()");
 
   for (i = optind + 1; i < argc - 1; i += 2)
     {
   if (!(g = new_graph (nv)))
     fatal ("new_graph ()");
 
   for (i = optind + 1; i < argc - 1; i += 2)
     {

-      u = (unsigned int) atoi (argv[i]);
-      v = (unsigned int) atoi (argv[i + 1]);
+      u = (unsigned int)atoi (argv[i]);
+      v = (unsigned int)atoi (argv[i + 1]);

       if (add_edge (g, u, v))
         fatal ("add_edge ()");
     }
       if (add_edge (g, u, v))
         fatal ("add_edge ()");
     }

diff --git a/lib/dbg.h b/lib/dbg.h
index 422c681e40bd6138f9d163fc1c6e91687cc4c44c..8e34e5166ea7ff342cd7db078cc37e1e4afea2c8 100644 (file)
--- a/lib/dbg.h
+++ b/lib/dbg.h
@@ -12,7 +12,7 @@
   do                                                                          \
     {                                                                         \
       fprintf (stderr, "(%s:%d) %s () failed: %s errno: %s\n", __FILE__,      \
   do                                                                          \
     {                                                                         \
       fprintf (stderr, "(%s:%d) %s () failed: %s errno: %s\n", __FILE__,      \

-               __LINE__, __func__, x, strerror (errno));                      \
+               __LINE__, __extension__ __func__, x, strerror (errno));        \

       exit (EXIT_FAILURE);                                                    \
     }                                                                         \
   while (0)
       exit (EXIT_FAILURE);                                                    \
     }                                                                         \
   while (0)