From: ellson <devnull@localhost>
Date: Sat, 12 Aug 2006 01:54:03 +0000 (+0000)
Subject: fix rpm breakage from missing headers in source distro for gtk plugin
X-Git-Tag: LAST_LIBGRAPH~32^2~5982
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f0cfd9636c7cc74f0d0c29e096f7c2905eb3aed;p=graphviz

fix rpm breakage from missing headers in source distro for gtk plugin
collect some return values to suppress warnings
---

diff --git a/lib/common/psusershape.c b/lib/common/psusershape.c
index 268a359fd..f9cfe3498 100644
--- a/lib/common/psusershape.c
+++ b/lib/common/psusershape.c
@@ -47,7 +47,7 @@ static usershape_t *user_init(char *str)
     char line[BUFSIZ];
     FILE *fp;
     struct stat statbuf;
-    int saw_bb, must_inline;
+    int saw_bb, must_inline, rc;
     int lx, ly, ux, uy;
     usershape_t *us;
 
@@ -84,7 +84,7 @@ static usershape_t *user_init(char *str)
 	fstat(fileno(fp), &statbuf);
 	contents = us->data = N_GNEW(statbuf.st_size + 1, char);
 	fseek(fp, 0, SEEK_SET);
-	fread(contents, statbuf.st_size, 1, fp);
+	rc = fread(contents, statbuf.st_size, 1, fp);
 	contents[statbuf.st_size] = '\0';
 	fclose(fp);
 	dtinsert(EPSF_contents, us);
diff --git a/plugin/core/gvrender_core.c b/plugin/core/gvrender_core.c
index 796e5a243..c8d5764cf 100644
--- a/plugin/core/gvrender_core.c
+++ b/plugin/core/gvrender_core.c
@@ -88,7 +88,7 @@ void core_fini_compression(GVJ_t *job)
 
 void core_fputs(GVJ_t * job, char *s)
 {
-    int len;
+    int len, rc;
 
     len = strlen(s);
     switch (job->compression) {
@@ -98,7 +98,7 @@ void core_fputs(GVJ_t * job, char *s)
 #endif
 	break;
     case COMPRESSION_NONE:
-	fwrite(s, sizeof(char), (unsigned) len, job->output_file);
+	rc = fwrite(s, sizeof(char), (unsigned) len, job->output_file);
 	break;
     }
 }
diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am
index 1abaf7ccc..f776894c6 100644
--- a/plugin/gtk/Makefile.am
+++ b/plugin/gtk/Makefile.am
@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
 
 if WITH_PANGOCAIRO
 if WITH_GTK
+noinst_HEADERS = support.h interface.h callbacks.h
 noinst_LTLIBRARIES = libgvplugin_gtk_C.la
 pkglib_LTLIBRARIES = libgvplugin_gtk.la
 endif
@@ -28,4 +29,4 @@ libgvplugin_gtk_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
 libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
 libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) $(GNOMEUI_LIBS)
 
-EXTRA_DIST = gtk.glade gtk.gladep
+EXTRA_DIST = gtk.glade gtk.gladep