summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b50befc)
raw | patch | inline | side by side (parent: b50befc)
author | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
Tue, 14 Aug 2012 09:23:11 +0000 (09:23 +0000) | ||
committer | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
Tue, 14 Aug 2012 09:23:11 +0000 (09:23 +0000) |
src/rrd_cgi.c | patch | blob | history | |
src/rrd_graph.c | patch | blob | history | |
src/rrd_open.c | patch | blob | history | |
src/rrd_parsetime.c | patch | blob | history | |
src/rrd_resize.c | patch | blob | history |
diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index a0c9b3b27d4f86d7e6f118da303024c004b6a08f..b403ca61fc60fc7ee3d641613c5df9344a5456fd 100644 (file)
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
int argc,
char *argv[])
{
- long length;
char *buffer;
- char *server_url = NULL;
long i;
long filter = 0;
struct option long_options[] = {
if (!filter) {
rrdcgiDebug(0, 0);
rrdcgiArg = rrdcgiInit();
- server_url = getenv("SERVER_URL");
}
/* make sure we have one extra argument,
fprintf(stderr, "ERROR: expected a filename\n");
exit(1);
} else {
- length = readfile(argv[optind], &buffer, 1);
+ readfile(argv[optind], &buffer, 1);
}
if (rrd_test_error()) {
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 317beccc97d3686f62857e291bbae32004299bdd..94616cb44f44cf5f79ec674e440ee6abd3db2a15 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
int leg_c = 0;
double leg_x = border;
int leg_y = 0; //im->yimg;
- int leg_y_prev = 0; // im->yimg;
int leg_cc;
double glue = 0;
int i, ii, mark = 0;
+(double)legspace[ii]
+ glue;
}
- leg_y_prev = leg_y;
if (leg_x > border || prt_fctn == 's')
leg_y += im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
if (prt_fctn == 's')
diff --git a/src/rrd_open.c b/src/rrd_open.c
index 9c839a157b9f3ac3a77807dc28195305ed257b4a..46a5fcf412b6b0a2beb41990e49ac97c528d500b 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
int whence)
{
off_t ret = 0;
+#ifndef HAVE_MMAP
rrd_simple_file_t *rrd_simple_file;
rrd_simple_file = (rrd_simple_file_t *)rrd_file->pvt;
-
+#endif
+
#ifdef HAVE_MMAP
if (whence == SEEK_SET)
rrd_file->pos = off;
diff --git a/src/rrd_parsetime.c b/src/rrd_parsetime.c
index d854dfbc971123834d26aee45d682873546624dc..d8b96f35d22d187a7625ee13cd74226a6bc64138 100644 (file)
--- a/src/rrd_parsetime.c
+++ b/src/rrd_parsetime.c
{
/* using time_t seems to help portability with 64bit oses */
time_t mday = 0, wday, mon, year = ptv->tm.tm_year;
- int tlen;
switch (sc_tokid) {
case YESTERDAY:
case NUMBER:
/* get numeric <sec since 1970>, MM/DD/[YY]YY, or DD.MM.[YY]YY
*/
- tlen = strlen(sc_token);
mon = atol(sc_token);
if (mon > 10 * 365 * 24 * 60 * 60) {
ptv->tm = *localtime(&mon);
diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index 3613d3f2b8db8fb4e889563ea488b878a5e224b5..d429f1740403ac78872014a0220cff1657c287b3 100644 (file)
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
unsigned long l, rra;
long modify;
unsigned long target_rra;
- int grow = 0, shrink = 0;
+ int shrink = 0;
char *endptr;
rrd_file_t *rrd_file, *rrd_out_file;
target_rra = strtol(argv[2], &endptr, 0);
if (!strcmp(argv[3], "GROW"))
- grow = 1;
+ shrink = 0;
else if (!strcmp(argv[3], "SHRINK"))
shrink = 1;
else {