5 files changed, 52 insertions, 50 deletions

diff --git a/src/graph.c b/src/graph.c
index 02e0586..80b2a97 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -89,7 +89,7 @@ draw_graph (FILE *fp,
   int full_xsize = graph_xsize + graph_h_margin[0] + graph_h_margin[1];
   int full_ysize = graph_ysize + graph_v_margin[0] + graph_v_margin[1];
   grid_t grid;
-  unsigned long ymax = mon->max_rate;
+  double ymax = mon->max_rate;
   
   yscale = (double) graph_ysize / ymax;
   xscale = (double) graph_xsize / xmax;
@@ -210,16 +210,16 @@ draw_graph (FILE *fp,
   grid = grid_create (ygrid, dataq, 0, ymax, mon);
   if (grid)
     {
-      unsigned long i;
+      double d;
       char *str = NULL;
       
       draw_vtext (graph, i_grid,
                   mon->rate_unit ? mon->rate_unit : rate_unit);
 
       /* Draw vertical grid */
-      while ((i = grid_next (grid, &str, NULL)) < ymax)
+      while ((d = grid_next (grid, &str, NULL)) < ymax)
         {
-          int y = ytr (i);
+          int y = ytr (d);
           
           /* Left tick */
           gdImageLine (graph,
@@ -247,13 +247,13 @@ draw_graph (FILE *fp,
   grid = grid_create (xgrid, dataq, 0, xmax, &start);
   if (grid)
     {
-      unsigned long i;
+      double d;
       char *str = NULL;
       int mark;
       
-      while ((i = grid_next (grid, &str, &mark)) < xmax)
+      while ((d = grid_next (grid, &str, &mark)) < xmax)
         {
-          int x = xtr (i);
+          int x = xtr (d);
           
           /* Tick */
           gdImageLine (graph,
diff --git a/src/grid.c b/src/grid.c
index 1671753..08e1c08 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -25,16 +25,16 @@ struct grid
 {
   struct grid_class *class;
   queue_t *q;
-  unsigned long vmin;
-  unsigned long vmax;
-  unsigned long cur;
+  double vmin;
+  double vmax;
+  double cur;
   char *str;
   void *data;
 };
 
 grid_t
 grid_create (struct grid_class *class, queue_t *q,
-             unsigned long vmin,  unsigned long vmax, void *cdata)
+             double vmin,  double vmax, void *cdata)
 {
   grid_t grid;
 
@@ -54,7 +54,7 @@ grid_create (struct grid_class *class, queue_t *q,
   return grid;
 }
     
-unsigned long
+double
 grid_next (grid_t grid, char **str, int *mark)
 {
   return grid->class->next (grid, str, mark);
@@ -87,7 +87,7 @@ size_t number_suffix_count = sizeof (short_suffix) / sizeof (short_suffix[0]);
 
 struct ygrid_data
 {
-  unsigned long step;
+  double step;
 };
 
 static void *
@@ -99,7 +99,7 @@ ygrid_create (grid_t grid, void *cdata)
   return gr;
 }
     
-static unsigned long
+static double
 ygrid_next (grid_t grid, char **str, int *mark)
 {
   struct ygrid_data *gr = grid->data;
@@ -154,11 +154,11 @@ xgrid_2h_create (grid_t grid, void *cdata)
   return gr;
 }
 
-static unsigned long
+static double
 xgrid_2h_next (grid_t grid, char **str, int *mark)
 {
   struct xgrid_data *gr = grid->data;
-  unsigned long ret = gr->off;
+  double ret = gr->off;
 
   if (grid->str)
     {
@@ -200,11 +200,11 @@ xgrid_wday_create (grid_t grid, void *cdata)
   return gr;
 }
 
-static unsigned long
+static double
 xgrid_wday_next (grid_t grid, char **str, int *mark)
 {
   struct xgrid_data *gr = grid->data;
-  unsigned long ret = gr->off;
+  double ret = gr->off;
   char buf[80];
   struct tm *tm = localtime (&gr->start);
 
@@ -250,11 +250,11 @@ xgrid_week_create (grid_t grid, void *cdata)
   return gr;
 }
 
-static unsigned long
+static double
 xgrid_week_next (grid_t grid, char **str, int *mark)
 {
   struct xgrid_data *gr = grid->data;
-  unsigned long ret = gr->off;
+  double ret = gr->off;
   struct tm *tm = localtime (&gr->start);
 
   if (tm->tm_mday && tm->tm_mday < 7 && mark && gr->unit == 0)
@@ -307,11 +307,11 @@ xgrid_month_create (grid_t grid, void *cdata)
   return gr;
 }
 
-static unsigned long
+static double
 xgrid_month_next (grid_t grid, char **str, int *mark)
 {
   struct xgrid_data *gr = grid->data;
-  unsigned long ret = gr->off;
+  double ret = gr->off;
   unsigned long frac;
   struct tm *tm = localtime (&gr->start);
   int mon;
diff --git a/src/output.c b/src/output.c
index e2e8b92..3c266b7 100644
--- a/src/output.c
+++ b/src/output.c
@@ -114,29 +114,30 @@ add_stats (pp_tab_t **ptab, struct monitor *mon, queue_t *q,
   int i, n = queue_count (q);
   struct traffic_history *tptr, th;
 
-  if (!n)
-    return;
-  for (i = 0; i < n; i++)
+  if (n)
     {
-      tptr = queue_get_ptr (q, i);
-      scale_sample (mon, tptr, &th);
+      for (i = 0; i < n; i++)
+        {
+          tptr = queue_get_ptr (q, i);
+          scale_sample (mon, tptr, &th);
+          
+          val[avgin_name] += th.inrate;
+          if (th.inrate > val[maxin_name])
+            val[maxin_name] = th.inrate;
+          
+          val[avgout_name] += th.outrate;
+          if (th.outrate > val[maxout_name])
+            val[maxout_name] = th.outrate;
+        }
+      val[avgin_name] /= n;
+      val[avgout_name] /= n;
 
-      val[avgin_name] += th.inrate;
-      if (th.inrate > val[maxin_name])
-        val[maxin_name] = th.inrate;
-      
-      val[avgout_name] += th.outrate;
-      if (th.outrate > val[maxout_name])
-        val[maxout_name] = th.outrate;
+      tptr = queue_get_tail (q);
+      scale_sample (mon, tptr, &th);
+      val[curin_name] = th.inrate;
+      val[curout_name] = th.outrate;
     }
-  val[avgin_name] /= n;
-  val[avgout_name] /= n;
-
-  tptr = queue_get_tail (q);
-  scale_sample (mon, tptr, &th);
-  val[curin_name] = th.inrate;
-  val[curout_name] = th.outrate;
-
+  
   for (i = 0; i < sizeof (val) / sizeof (val[0]); i++)
     add_numeric_value (ptab, symname[i], val[i]);
 }
diff --git a/src/readconfig.c b/src/readconfig.c
index a514691..1c22cb1 100644
--- a/src/readconfig.c
+++ b/src/readconfig.c
@@ -100,7 +100,7 @@ cb_monitor (enum grecs_callback_command cmd,
       mon = xzalloc (sizeof (*mon));