From: Emden Gansner <erg@research.att.com>
Date: Fri, 11 Nov 2011 20:12:13 +0000 (-0500)
Subject: Fix warning messages
X-Git-Tag: LAST_LIBGRAPH~32^2~596
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8462942fab3188d461fe82fa105822efcf33510;p=graphviz

Fix warning messages
---

diff --git a/lib/cgraph/agerror.c b/lib/cgraph/agerror.c
index 43af48477..ae4e7fbd3 100644
--- a/lib/cgraph/agerror.c
+++ b/lib/cgraph/agerror.c
@@ -97,7 +97,7 @@ userout (agerrlevel_t level, const char *fmt, va_list args)
     va_end(args);
 }
 
-static int agerr_va(agerrlevel_t level, char *fmt, va_list args)
+static int agerr_va(agerrlevel_t level, const char *fmt, va_list args)
 {
     agerrlevel_t lvl;
 
@@ -139,7 +139,7 @@ static int agerr_va(agerrlevel_t level, char *fmt, va_list args)
     return 0;
 }
 
-int agerr(agerrlevel_t level, char *fmt, ...)
+int agerr(agerrlevel_t level, const char *fmt, ...)
 {
     va_list args;
 
@@ -147,7 +147,7 @@ int agerr(agerrlevel_t level, char *fmt, ...)
     return agerr_va(level, fmt, args);
 }
 
-void agerrorf(char *fmt, ...)
+void agerrorf(const char *fmt, ...)
 {
     va_list args;
 
@@ -155,7 +155,7 @@ void agerrorf(char *fmt, ...)
     agerr_va(AGERR, fmt, args);
 }
 
-void agwarningf(char *fmt, ...)
+void agwarningf(const char *fmt, ...)
 {
     va_list args;
 
diff --git a/lib/cgraph/cgraph.h b/lib/cgraph/cgraph.h
index 9b648edb2..08d5c0f16 100644
--- a/lib/cgraph/cgraph.h
+++ b/lib/cgraph/cgraph.h
@@ -391,9 +391,9 @@ typedef enum { AGWARN, AGERR, AGMAX, AGPREV } agerrlevel_t;
 typedef int (*agusererrf) (char*);
 extern agerrlevel_t agseterr(agerrlevel_t);
 extern char *aglasterr(void);
-extern int agerr(agerrlevel_t level, char *fmt, ...);
-extern void agerrorf(char *fmt, ...);
-extern void agwarningf(char *fmt, ...);
+extern int agerr(agerrlevel_t level, const char *fmt, ...);
+extern void agerrorf(const char *fmt, ...);
+extern void agwarningf(const char *fmt, ...);
 extern int agerrors(void);
 extern int agreseterrors(void);
 extern agusererrf agseterrf(agusererrf);
diff --git a/lib/ingraphs/ingraphs.c b/lib/ingraphs/ingraphs.c
index cf6360251..af267b6de 100644
--- a/lib/ingraphs/ingraphs.c
+++ b/lib/ingraphs/ingraphs.c
@@ -109,7 +109,7 @@ new_ing(ingraph_state * sp, char **files, Agraph_t** graphs, ingdisc * disc)
     }
     else {
 	sp->ingraphs = 0;
-	sp->u.Graphs = files;
+	sp->u.Files = files;
     }
     sp->ctr = 0;
     sp->errors = 0;