added perftest tool

[rrdtool.git] / src / rrd_update.c

diff --git a/src/rrd_update.c b/src/rrd_update.c
index da8f56a..9d7d251 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.15  Copyright by Tobi Oetiker, 1997-2006
  *****************************************************************************
  * rrd_update.c  RRD Update Function
  *****************************************************************************
@@ -94,31 +94,12 @@ int _rrd_update(char *filename, char *tmplt, int argc, char **argv,
 #define IFDNAN(X,Y) (isnan(X) ? (Y) : (X));
 
 
-#ifdef STANDALONE
-int 
-main(int argc, char **argv){
-        rrd_update(argc,argv);
-        if (rrd_test_error()) {
-                printf("RRDtool " PACKAGE_VERSION "  Copyright by Tobi Oetiker, 1997-2005\n\n"
-                        "Usage: rrdupdate filename\n"
-                        "\t\t\t[--template|-t ds-name:ds-name:...]\n"
-                        "\t\t\ttime|N:value[:value...]\n\n"
-                        "\t\t\tat-time@value[:value...]\n\n"
-                        "\t\t\t[ time:value[:value...] ..]\n\n");
-                                   
-                printf("ERROR: %s\n",rrd_get_error());
-                rrd_clear_error();                                                            
-                return 1;
-        }
-        return 0;
-}
-#endif
-
 info_t *rrd_update_v(int argc, char **argv)
 {
     char             *tmplt = NULL;          
        info_t *result = NULL;
        infoval rc;
+      rc.u_int = -1;
     optind = 0; opterr = 0;  /* initialize getopt */
 
     while (1) {
@@ -142,7 +123,6 @@ info_t *rrd_update_v(int argc, char **argv)
                
                case '?':
                        rrd_set_error("unknown option '%s'",argv[optind-1]);
-            rc.u_int = -1;
                        goto end_tag;
                }
     }
@@ -150,9 +130,9 @@ info_t *rrd_update_v(int argc, char **argv)
     /* need at least 2 arguments: filename, data. */
     if (argc-optind < 2) {
                rrd_set_error("Not enough arguments");
-        rc.u_int = -1;
                goto end_tag;
     }
+    rc.u_int = 0;
     result = info_push(NULL,sprintf_alloc("return_value"),RD_I_INT,rc);
        rc.u_int = _rrd_update(argv[optind], tmplt,
                      argc - optind - 1, argv + optind + 1, result);