fix "function declaration isn't a prototype" warnings from -Wstrict-prototypes

    mostly by using (void) instead of () for functions with empty parameter lists.

diff --git a/lib/common/emit.c b/lib/common/emit.c
index bc443da6c2ad968f22fc0e05a3c919c1634d4d0e..5131ba008342404619d9c73616d7195732401e5e 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -1213,7 +1213,7 @@ int emit_once(char *str)
     return FALSE;
 }
 
-static void emit_once_reset()
+static void emit_once_reset(void)
 {
     if (strings) {
        dtclose(strings);
@@ -1391,7 +1391,7 @@ static int style_token(char **s, agxbuf * xb)
 static unsigned char outbuf[SMALLBUF];
 static agxbuf ps_xb;
 
-static void cleanup()
+static void cleanup(void)
 {
     agxbfree(&ps_xb);
 }

diff --git a/lib/common/gdgen.c b/lib/common/gdgen.c
index 44ca50d6e527ee6b5acf7ef716a6c4a3884ebfeb..4ee11a49ad05d597cf2e45373a661d33c253ec0f 100644 (file)
--- a/lib/common/gdgen.c
+++ b/lib/common/gdgen.c
@@ -23,7 +23,7 @@
 #endif
 
 extern gdImagePtr gd_getshapeimage(char *name);
-extern void gd_freeusershapes();
+extern void gd_freeusershapes(void);
 
 static gdImagePtr im;
 
@@ -407,7 +407,7 @@ static void gd_begin_node(node_t * n)
     Curnode = n;
 }
 
-static void gd_end_node()
+static void gd_end_node(void)
 {
     Curnode = NULL;
 }

diff --git a/lib/common/gdusershape.c b/lib/common/gdusershape.c
index 7efb8884289ee16e5d5396b19e21b44720dde53e..ac02fb6d69941d6e98d166722a29ac2571102c65 100644 (file)
--- a/lib/common/gdusershape.c
+++ b/lib/common/gdusershape.c
@@ -113,7 +113,7 @@ gdImagePtr gd_getshapeimage(char *name)
     return val->im;
 }
 
-void gd_freeusershapes()
+void gd_freeusershapes(void)
 {
     if (ImageDict) {
        dtclose(ImageDict);

diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c
index aeb037151ccf84079572348dbc46520890cbb415..3a4072e6a8784c405bc51f4d9bdff0c0d9743abd 100644 (file)
--- a/lib/common/htmllex.c
+++ b/lib/common/htmllex.c
@@ -53,7 +53,7 @@ static lexstate_t state;
 /* error_context:
  * Print the last 2 "token"s seen.
  */
-static void error_context()
+static void error_context(void)
 {
     agxbclear(state.xb);
     if (state.prevtoklen > 0)

diff --git a/lib/common/htmllex.h b/lib/common/htmllex.h
index b01221c9fe0275e4748153ff33cdc57d9cecb429..bb899ace3abeacd7ca821cabc9dd64afb28647b4 100644 (file)
--- a/lib/common/htmllex.h
+++ b/lib/common/htmllex.h
@@ -24,9 +24,9 @@ extern "C" {
 #include <agxbuf.h>
 
     extern int initHTMLlexer(char *, agxbuf *);
-    extern int htmllex();
-    extern int htmllineno();
-    extern int clearHTMLlexer();
+    extern int htmllex(void);
+    extern int htmllineno(void);
+    extern int clearHTMLlexer(void);
     void htmlerror(const char *);
 
 #endif

diff --git a/lib/common/htmlparse.y b/lib/common/htmlparse.y
index 2152da8f1fe62bacf64fc550267da73d56518373..50d9a530c9c18cdb722a1588198e138c8414cb5b 100644 (file)
--- a/lib/common/htmlparse.y
+++ b/lib/common/htmlparse.y
@@ -20,7 +20,7 @@
 #include "htmltable.h"
 #include "htmllex.h"
 
-extern int yyparse();
+extern int yyparse(void);
 
 static struct {
   htmllabel_t* lbl;       /* Generated label */
@@ -184,8 +184,7 @@ mkText (const char* lastl)
 /* addRow:
  * Add new cell row to current table.
  */
-static void
-addRow ()
+static void addRow (void)
 {
   Dt_t*      dp = dtopen(&cellDisc, Dtqueue);
   htmltbl_t* tbl = HTMLstate.tblstack;
@@ -198,8 +197,7 @@ addRow ()
 /* setCell:
  * Set cell body and type and attach to row
  */
-static void
-setCell (htmlcell_t* cp, void* obj, int kind)
+static void setCell (htmlcell_t* cp, void* obj, int kind)
 {
   pitem*     sp = NEW(pitem);
   htmltbl_t* tbl = HTMLstate.tblstack;
@@ -224,8 +222,7 @@ setCell (htmlcell_t* cp, void* obj, int kind)
  * the inmost value is the one used, we only use a new value
  * if the attribute has not already been assigned.
  */
-static htmlfont_t*
-setFont (htmlfont_t* fp, htmlfont_t*  curf)
+static htmlfont_t* setFont (htmlfont_t* fp, htmlfont_t*  curf)
 {
   if (curf) {
     if (curf->size < 0.0) curf->size = fp->size;
@@ -244,8 +241,7 @@ setFont (htmlfont_t* fp, htmlfont_t*  curf)
 /* fontText:
  * Attach font information to text.
  */
-static void
-fontText (htmlfont_t* fp, htmltxt_t* cp)
+static void fontText (htmlfont_t* fp, htmltxt_t* cp)
 {
   cp->font = setFont (fp, cp->font);
 }
@@ -253,8 +249,7 @@ fontText (htmlfont_t* fp, htmltxt_t* cp)
 /* fontTable:
  * Attach font information to table.
  */
-static void
-fontTable (htmlfont_t* fp, htmltbl_t* cp)
+static void fontTable (htmlfont_t* fp, htmltbl_t* cp)
 {
   cp->font = setFont (fp, cp->font);
 }
@@ -262,8 +257,7 @@ fontTable (htmlfont_t* fp, htmltbl_t* cp)
 /* mkLabel:
  * Create label, given body and type.
  */
-static htmllabel_t*
-mkLabel (void* obj, int kind)
+static htmllabel_t* mkLabel (void* obj, int kind)
 {
   htmllabel_t* lp = NEW(htmllabel_t);
 
@@ -282,8 +276,7 @@ mkLabel (void* obj, int kind)
  * tables. Note that we use the free_citem function to actually
  * free cells.
  */
-static void
-cleanup ()
+static void cleanup (void)
 {
   htmltbl_t* tp = HTMLstate.tblstack;
   htmltbl_t* next;
@@ -304,8 +297,7 @@ cleanup ()
 /* nonSpace:
  * Return 1 if s contains a non-space character.
  */
-static int
-nonSpace (char* s)
+static int nonSpace (char* s)
 {
   char   c;
 

diff --git a/lib/common/pointset.c b/lib/common/pointset.c
index acd83e4d0b8dc623b4166aea513acc18ef3aaa3b..c3cb4bfd81d0ec74915f0dcaf7fedf88e9e8f93a 100644 (file)
--- a/lib/common/pointset.c
+++ b/lib/common/pointset.c
@@ -57,7 +57,7 @@ Dtdisc_t intPairDisc = {
     0
 };
 
-PointSet *newPS()
+PointSet *newPS(void)
 {
     return (dtopen(&intPairDisc, Dtoset));
 }
@@ -159,7 +159,7 @@ Dtdisc_t intMPairDisc = {
     0
 };
 
-PointMap *newPM()
+PointMap *newPM(void)
 {
     MPairDisc *dp = GNEW(MPairDisc);
 

diff --git a/lib/common/pointset.h b/lib/common/pointset.h
index bcea463f0471e65d83353561738fcf0b33427418..d8ab16a98d348b50d80f2e2af4dbd6ae2feaa580 100644 (file)
--- a/lib/common/pointset.h
+++ b/lib/common/pointset.h
@@ -28,7 +28,7 @@ extern "C" {
     typedef Dict_t PointSet;
     typedef Dict_t PointMap;
 
-    extern PointSet *newPS();
+    extern PointSet *newPS(void);
     extern void freePS(PointSet *);
     extern void insertPS(PointSet *, point);
     extern void addPS(PointSet *, int, int);
@@ -37,7 +37,7 @@ extern "C" {
     extern int sizeOf(PointSet *);
     extern point *pointsOf(PointSet *);
 
-    extern PointMap *newPM();
+    extern PointMap *newPM(void);
     extern void clearPM(PointMap *);
     extern void freePM(PointMap *);
     extern int insertPM(PointMap *, int, int, int);

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index 47f34284f3234f27cf5058198152f83b8257fcb5..d47ec7aac412b14a80c5d9d97f1eb89b7569aefa 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 extern void epsf_define(FILE * of);
-extern void ps_freeusershapes();
+extern void ps_freeusershapes(void);
 extern ps_image_t *ps_usershape(char *shapeimagefile);
 
 static int N_pages, Cur_page;

diff --git a/lib/common/psusershape.c b/lib/common/psusershape.c
index a78b4c6ee0a492b9ad575ec0c04c63c89180564e..1da372e8555bab42d1c8c3dae77ebebfe03313d8 100644 (file)
--- a/lib/common/psusershape.c
+++ b/lib/common/psusershape.c
@@ -209,7 +209,7 @@ point ps_user_shape_size(node_t * n, char *shapeimagefile)
     return (ps_image_size(n->graph, shapeimagefile));
 }
 
-void ps_freeusershapes()
+void ps_freeusershapes(void)
 {
     if (EPSF_contents) {
        dtclose(EPSF_contents);

diff --git a/lib/common/renderprocs.h b/lib/common/renderprocs.h
index 48ab132cab563a52fe98276266f232096f4a7868..bf8d0c0dbff656f05cb2847b857d01a135707a4c 100644 (file)
--- a/lib/common/renderprocs.h
+++ b/lib/common/renderprocs.h
@@ -169,7 +169,7 @@ extern "C" {
     extern void update(edge_t * e, edge_t * f);
     extern void updateBB(graph_t * g, textlabel_t * lp);
     extern void use_library(char *);
-    extern char *username();
+    extern char *username(void);
     extern point user_shape_size(node_t * n, char *shapefile);
     extern void write_attributed_dot(graph_t *g, FILE *f);
     extern void write_canonical_dot(graph_t *g, FILE *f);
@@ -188,7 +188,7 @@ extern "C" {
     extern pointf sub_pointfs(pointf, pointf);
 
     extern void toggle(int);
-    extern int test_toggle();
+    extern int test_toggle(void);
 
 #ifndef DISABLE_CODEGENS
 #ifndef HAVE_GD_FREETYPE
@@ -197,8 +197,8 @@ extern "C" {
     extern int builtinFontHt(double fontsz);
     extern int builtinFontWd(double fontsz);
 #endif
-    extern codegen_info_t *first_codegen();
-    extern codegen_info_t *next_codegen();
+    extern codegen_info_t *first_codegen(void);
+    extern codegen_info_t *next_codegen(codegen_info_t * p);
 #endif
 
 #undef extern

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index 8ca22cad9e4c6258773b4d98c7a3e91a272ddbc8..b993b6c5a4e46c0911c809940e8fcc3482833fbb 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -14,6 +14,9 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+/* for sincos */
+#define _GNU_SOURCE 1
+
 #include       "render.h"
 #include       "gvc.h"
 #include       "htmltable.h"
@@ -27,15 +30,10 @@
 #define RBCONST 12
 #define RBCURVE .5
 
-#ifndef HAVE_SINCOS
-void sincos(x, s, c)
-double x, *s, *c;
-{
-    *s = sin(x);
-    *c = cos(x);
-}
-#else
+#ifdef HAVE_SINCOS
 extern void sincos(double x, double *s, double *c);
+#else
+# define sincos(x,s,c) *s = sin(x); *c = cos(x)
 #endif
 
 static port Center = { {0, 0}, -1, 0, 0, 0, 0 };

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 2497d4bec19cab9e696957238d1a2725e853f4a0..15621bfa28652afb842f770404f8dc8ce3a7fd0e 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -416,7 +416,7 @@ edge_t *debug_getedge(graph_t * g, char *s0, char *s1)
 static unsigned char userbuf[SMALLBUF];
 static agxbuf xb;
 
-static void cleanup()
+static void cleanup(void)
 {
     agxbfree(&xb);
 }

diff --git a/lib/common/vrmlgen.c b/lib/common/vrmlgen.c
index c9fe7e6e0d32a5e40fd99310afe8c82b2ab0c43c..2f9d4af133ed49123137c20d761cf5701a1a8a87 100644 (file)
--- a/lib/common/vrmlgen.c
+++ b/lib/common/vrmlgen.c
@@ -332,7 +332,7 @@ static void vrml_begin_edge(edge_t * e)
 }
 
 static void
-finishSegment ()
+finishSegment (void)
 {
     point p0 = ND_coord_i(Curedge->tail);
     point p1 = ND_coord_i(Curedge->head);

diff --git a/lib/common/vtxgen.c b/lib/common/vtxgen.c
index 52591fef551ed5b61d139b221697b685d19ef97b..5c159deda52607674e7eb74d9cc70829f32e4866 100644 (file)
--- a/lib/common/vtxgen.c
+++ b/lib/common/vtxgen.c
@@ -385,7 +385,7 @@ static void vtx_set_font(char *name, double size)
     vtx_font(&cstk[SP]);
 }
 
-static void vtx_style()
+static void vtx_style(void)
 {
     context_t *cp;
 
@@ -404,7 +404,7 @@ static void vtx_style()
            cp->color_r, cp->color_g, cp->color_b, cp->penwidth);
 }
 
-static void vtx_node_style()
+static void vtx_node_style(void)
 {
     fprintf(Output_file, "    (rotation 0)\n" "    (locked F)\n");
     vtx_style();

diff --git a/lib/common/xdgen.c b/lib/common/xdgen.c
index 7a341955114b5ef92b011ce02ae2fa2412a1e19e..70cbc6e440bf6e5092008dd4f15bb5f2ba6ee4b0 100644 (file)
--- a/lib/common/xdgen.c
+++ b/lib/common/xdgen.c
@@ -93,7 +93,7 @@ static void xd_begin_cluster(Agraph_t * sg)
     cluster_g = sg;
 }
 
-static void xd_end_cluster()
+static void xd_end_cluster(void)
 {
     agxset(cluster_g, g_draw->index, agxbuse(&outbuf));
     if (GD_label(cluster_g))

diff --git a/lib/dotgen/sameport.c b/lib/dotgen/sameport.c
index a639bfeb58c5f04179cf302477f46a3a83a262b9..170500e116bd6f899755f94664bab17544a11fb9 100644 (file)
--- a/lib/dotgen/sameport.c
+++ b/lib/dotgen/sameport.c
@@ -161,6 +161,8 @@ static void sameport(node_t * u, elist * l, double arr_len)
        (MC_SCALE * (ND_lw_i(u) + prt.p.x)) / (ND_lw_i(u) + ND_rw_i(u));
     prt.constrained = FALSE;
     prt.defined = TRUE;
+    prt.clip = 0;
+    prt.theta = 0;
 
     /* compute ARR_PORT at a distance ARR_LEN away from the boundary */
     if ((arr_prt.defined = arr_len && TRUE)) {

diff --git a/lib/graph/graph.h b/lib/graph/graph.h
index 2fa049f58baa6d1a2f6d929af26246fe4181c24d..d5647048b050f043a7f360fadb486efcb651bc1f 100644 (file)
--- a/lib/graph/graph.h
+++ b/lib/graph/graph.h
@@ -151,7 +151,7 @@ extern "C" {
     extern Agraph_t *agmemread(char *);
     extern int agwrite(Agraph_t *, FILE *);
     extern int agerrors(void);
-    extern Agraph_t *agprotograph();
+    extern Agraph_t *agprotograph(void);
     extern Agraph_t *agusergraph(Agnode_t *);
     extern int agnnodes(Agraph_t *);
     extern int agnedges(Agraph_t *);
@@ -186,7 +186,7 @@ extern "C" {
     typedef enum { AGWARN, AGERR, AGMAX, AGPREV } agerrlevel_t;
     extern agerrlevel_t agerrno;
     extern void agseterr(agerrlevel_t);
-    extern char *aglasterr();
+    extern char *aglasterr(void);
     extern int agerr(agerrlevel_t level, char *fmt, ...);
     extern void agerrorf(char *fmt, ...);
     extern void agwarningf(char *fmt, ...);