Cleanup warnings and add missing include directory.

diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index bdc03bc24cf2784523e3ac14555a4f924e2bfcce..d61f399952e0202c5527ddeed9eda1c1e5bf27c5 100644 (file)
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/sfdpgen \
        -I$(top_srcdir)/lib/mingle \
        -I$(top_srcdir)/lib/ingraphs \
+       -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt
 

diff --git a/cmd/mingle/minglemain.c b/cmd/mingle/minglemain.c
index d8cfb080f57ecd64732e05c0bacda9bc786aaa18..c2cd67398025d27e1989eb37d83b83f45b575492 100644 (file)
--- a/cmd/mingle/minglemain.c
+++ b/cmd/mingle/minglemain.c
@@ -124,8 +124,8 @@ checkG (Agraph_t* g)
 
 static void init(int argc, char *argv[], opts_t* opts)
 {
-       unsigned int c;
-       char* CmdName = argv[0];
+       int c;
+       char* cmd = argv[0];
        real s;
     int i;
 
@@ -179,7 +179,7 @@ static void init(int argc, char *argv[], opts_t* opts)
                                fprintf (stderr, "-k arg %s must be an integer >= 2 - ignored\n", optarg); 
                        break;
                case 'o':
-                       outfile = openFile(optarg, "w", CmdName);
+                       outfile = openFile(optarg, "w", cmd);
                        break;
                case 'p':
             if ((sscanf(optarg,"%lf",&s) > 0))
@@ -204,7 +204,7 @@ static void init(int argc, char *argv[], opts_t* opts)
                case 'v':
                        Verbose = 1;
             if ((sscanf(optarg,"%d",&i) > 0) && (i >= 0))
-                               Verbose =  i;
+                               Verbose =  (unsigned char)i;
                        else 
                                optind--;
                        break;
@@ -212,7 +212,7 @@ static void init(int argc, char *argv[], opts_t* opts)
                        if (optopt == 'v')
                                Verbose = 1;
                        else {
-                               fprintf(stderr, "%s: option -%c missing argument\n", CmdName, optopt);
+                               fprintf(stderr, "%s: option -%c missing argument\n", cmd, optopt);
                                usage(1);
                        }
                        break;
@@ -220,7 +220,9 @@ static void init(int argc, char *argv[], opts_t* opts)
                        if (optopt == '?')
                                usage(0);
                        else
-                               fprintf(stderr, "%s: option -%c unrecognized - ignored\n", CmdName, optopt);
+                               fprintf(stderr, "%s: option -%c unrecognized - ignored\n", cmd, optopt);
+                       break;
+               default:
                        break;
                }
     }