allow rrd_rpncalc to build without cairo dependencies ...

fix warnings

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1348 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 3e65df10e7e2ad47d5478b6edfdf357dd518ff86..7e85cd635935d990b17fa3aeb52ab7b0e7832af8 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -14,8 +14,6 @@
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
 
-#define MAX_VNAME_LEN 255
-#define DEF_NAM_FMT "%255[-_A-Za-z0-9]"
 
 #define ALTYGRID        0x01   /* use alternative y grid algorithm */
 #define ALTAUTOSCALE    0x02   /* use alternative algorithm to find lower and upper bounds */

diff --git a/src/rrd_info.c b/src/rrd_info.c
index e0bcefa0a95b524a989f76e8934aecffde8000dd..5bfe9ffe4428ec13aac2f20c6983724b1fdb61d7 100644 (file)
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
@@ -334,8 +334,6 @@ info_t   *rrd_info_r(
 void info_print(
     info_t *data)
 {
-    long      image_length = 0;
-
     while (data) {
         printf("%s = ", data->key);
 

diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index 65c124ee43ad8fe0ea18f0f64f7aa0efd8c9792f..f63b74399d171d5a5dfd9a0ee92817e32f901122 100644 (file)
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -6,7 +6,7 @@
 
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
-#include "rrd_graph.h"
+// #include "rrd_graph.h"
 #include <limits.h>
 #include <locale.h>
 

diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h
index 3e4da4c796a5855fa42a08ef66348604a19a7c58..9f8b670feeddfbea44e70ef8fde73814f9320362 100644 (file)
--- a/src/rrd_rpncalc.h
+++ b/src/rrd_rpncalc.h
@@ -36,6 +36,9 @@ typedef struct rpn_cdefds_t {
     short     val;      /* used by OP_NUMBER and OP_VARIABLE */
 } rpn_cdefds_t;
 
+#define MAX_VNAME_LEN 255
+#define DEF_NAM_FMT "%255[-_A-Za-z0-9]"
+
 /* limit imposed by sizeof(rpn_cdefs_t) and rrd.ds_def.par */
 #define DS_CDEF_MAX_RPN_NODES 26
 

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 5eaf10588ae7ddcf1009f48ee23518aeb988ddc6..68d546552d60c8f64896b550a4e83abe06238b93 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -803,8 +803,8 @@ int HandleInputLine(
 
     } else if (strcmp("graphv", argv[1]) == 0) {
         info_t   *grinfo = NULL;    /* 1 to distinguish it from the NULL that rrd_graph sends in */
-
-        if (grinfo = rrd_graph_v(argc - 1, &argv[1])) {
+        grinfo = rrd_graph_v(argc - 1, &argv[1]);
+        if (grinfo) {
             info_print(grinfo);
             info_free(grinfo);
         }