projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added missing " escapes to xml header in rrd_tool.c
[rrdtool.git]
/
src
/
rrd_cgi.c
diff --git
a/src/rrd_cgi.c
b/src/rrd_cgi.c
index
23567c5
..
5e66095
100644
(file)
--- a/
src/rrd_cgi.c
+++ b/
src/rrd_cgi.c
@@
-1,11
+1,13
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2.
23
Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.2.
99907080300
Copyright by Tobi Oetiker, 1997-2007
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
#include "rrd_tool.h"
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
#include "rrd_tool.h"
-
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
#define MEMBLK 1024
/*#define DEBUG_PARSER
#define MEMBLK 1024
/*#define DEBUG_PARSER
@@
-221,7
+223,7
@@
static size_t varheap_size = 0;
/* allocate and initialize variable heap */
static int initvar(
/* allocate and initialize variable heap */
static int initvar(
- )
+
void
)
{
varheap = (vardata *) malloc(sizeof(vardata) * INIT_VARSTORE_SIZE);
if (varheap == NULL) {
{
varheap = (vardata *) malloc(sizeof(vardata) * INIT_VARSTORE_SIZE);
if (varheap == NULL) {
@@
-235,7
+237,7
@@
static int initvar(
/* cleanup: free allocated memory */
static void donevar(
/* cleanup: free allocated memory */
static void donevar(
- )
+
void
)
{
int i;
{
int i;
@@
-288,13
+290,13
@@
static const char *putvar(
if (0 == strcmp(name, varheap[i].name)) {
/* overwrite existing entry */
if (varheap[i].is_const) {
if (0 == strcmp(name, varheap[i].name)) {
/* overwrite existing entry */
if (varheap[i].is_const) {
-#ifdef
DEBUG_VARS
+#ifdef DEBUG_VARS
printf("<!-- setver(%s, %s): not assigning: "
"const variable -->\n", name, value);
printf("<!-- setver(%s, %s): not assigning: "
"const variable -->\n", name, value);
-#
endif
+#endif
return varheap[i].value;
}
return varheap[i].value;
}
-#ifdef
DEBUG_VARS
+#ifdef DEBUG_VARS
printf("<!-- setvar(%s, %s): overwriting old value (%s) -->\n",
name, value, varheap[i].value);
#endif
printf("<!-- setvar(%s, %s): overwriting old value (%s) -->\n",
name, value, varheap[i].value);
#endif
@@
-398,6
+400,10
@@
int main(
char *server_url = NULL;
long i;
long filter = 0;
char *server_url = NULL;
long i;
long filter = 0;
+ struct option long_options[] = {
+ {"filter", no_argument, 0, 'f'},
+ {0, 0, 0, 0}
+ };
#ifdef MUST_DISABLE_SIGFPE
signal(SIGFPE, SIG_IGN);
#ifdef MUST_DISABLE_SIGFPE
signal(SIGFPE, SIG_IGN);
@@
-412,10
+418,6
@@
int main(
for (i=0;i<argc;i++)
printf("%d-'%s'\n",i,argv[i]); */
while (1) {
for (i=0;i<argc;i++)
printf("%d-'%s'\n",i,argv[i]); */
while (1) {
- static struct option long_options[] = {
- {"filter", no_argument, 0, 'f'},
- {0, 0, 0, 0}
- };
int option_index = 0;
int opt;
int option_index = 0;
int opt;
@@
-494,7
+496,7
@@
int main(
if (!filter) {
printf("Content-Type: text/html\n"
if (!filter) {
printf("Content-Type: text/html\n"
- "Content-Length: %d\n", strlen(buffer));
+ "Content-Length: %
z
d\n", strlen(buffer));
if (labs(goodfor) > 0) {
time_t now;
if (labs(goodfor) > 0) {
time_t now;
@@
-1428,8
+1430,8
@@
s_var **rrdcgiReadVariables(
/* try to find out if there's already such a variable */
for (k = 0; k < i && (strncmp(result[k]->name, cp, esp - cp)
/* try to find out if there's already such a variable */
for (k = 0; k < i && (strncmp(result[k]->name, cp, esp - cp)
- || !(strlen(result[k]->name) ==
esp - cp));
- k++);
+ || !(strlen(result[k]->name) ==
+
(size_t) (esp - cp)));
k++);
if (k == i) { /* No such variable yet */
if ((result[i] = (s_var *) malloc(sizeof(s_var))) == NULL)
if (k == i) { /* No such variable yet */
if ((result[i] = (s_var *) malloc(sizeof(s_var))) == NULL)