Compile time improvments for NetWare and Win32 -- Guenter Knauf gk.gknw.de

[rrdtool.git] / src / rrd_update.c

diff --git a/src/rrd_update.c b/src/rrd_update.c
index ca88a67..6296cfe 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.11  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_update.c  RRD Update Function
  *****************************************************************************
@@ -171,7 +171,7 @@ rrd_update(int argc, char **argv)
     while (1) {
                static struct option long_options[] =
                        {
-                               {"tmplt",      required_argument, 0, 't'},
+                               {"template",      required_argument, 0, 't'},
                                {0,0,0,0}
                        };
                int option_index = 0;
@@ -783,6 +783,8 @@ _rrd_update(char *filename, char *tmplt, int argc, char **argv,
                       a heart beat can be unknown */
                    /* (rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt 
                     > rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) || */
+                   /* if the interval is larger thatn mrhb we get NAN */
+                   (interval > rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt) ||
                    (occu_pdp_st-proc_pdp_st <= 
                     rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt)) {
                    pdp_temp[i] = DNAN;