X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Frrd_cgi.c;h=ad9a3764d51ea0eda3f37242721b498049a3d62d;hb=fbe390e15d3484315efe5802577249c8959e3556;hp=b2195e426e308c0ec18208399d8a16dc139b24c2;hpb=81dadfe5d722bbaf4c2cfb50e2101e1a78bb8fea;p=rrdtool.git

diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index b2195e4..ad9a376 100644
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.21  Copyright by Tobi Oetiker, 1997-2007
  *****************************************************************************
  * rrd_cgi.c  RRD Web Page Generator
  *****************************************************************************/
@@ -550,12 +550,8 @@ char* rrdgetinternal(long argc, const char **args){
   if (argc == 1) {
     if( strcasecmp( args[0], "VERSION") == 0) {
       return stralloc(PACKAGE_VERSION);
-    } else if( strcasecmp( args[0], "COPYRIGHT") == 0) {
-      return stralloc(PACKAGE_COPYRIGHT);
     } else if( strcasecmp( args[0], "COMPILETIME") == 0) {
       return stralloc(__DATE__ " " __TIME__);
-    } else if( strcasecmp( args[0], "OS") == 0) {
-      return stralloc(OS);
     } else {
       return stralloc("[ERROR: internal unknown argument]");
     }
@@ -578,7 +574,7 @@ char* printstrftime(long argc, const char **args){
 	/* Make sure that we were given the right number of args */
 	if( argc != 4) {
 		rrd_set_error( "wrong number of args %d", argc);
-		return (char *) -1;
+		return stralloc("");
 	}
 
 	/* Init start and end time */
@@ -588,14 +584,14 @@ char* printstrftime(long argc, const char **args){
 	/* Parse the start and end times we were given */
 	if( (parsetime_error = parsetime( args[1], &start_tv))) {
 		rrd_set_error( "start time: %s", parsetime_error);
-		return (char *) -1;
+		return stralloc("");
 	}
 	if( (parsetime_error = parsetime( args[2], &end_tv))) {
 		rrd_set_error( "end time: %s", parsetime_error);
-		return (char *) -1;
+		return stralloc("");
 	}
 	if( proc_start_end( &start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
-		return (char *) -1;
+		return stralloc("");
 	}
 
 	/* Do we do the start or end */
@@ -607,7 +603,7 @@ char* printstrftime(long argc, const char **args){
 	}
 	else {
 		rrd_set_error( "start/end not found in '%s'", args[0]);
-		return (char *) -1;
+		return stralloc("");
 	}
 
 	/* now format it */
@@ -616,7 +612,7 @@ char* printstrftime(long argc, const char **args){
 	}
 	else {
 		rrd_set_error( "strftime failed");
-		return (char *) -1;
+		return stralloc("");
 	}
 }