Attachment 297334 Details for Bug 436662 – Patch to fix kMG overlap issue.

[patch] Patch to fix kMG overlap issue.

mrtg-2.14.5-kMG.patch (text/plain), 1.44 KB, created by Ray Van Dolson on 2008-03-08 22:03:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Van Dolson

Created: 2008-03-08 22:03:30 UTC

Size: 1.44 KB

patch

obsolete

>diff -uNr mrtg-2.14.5.orig/src/rateup.c mrtg-2.14.5/src/rateup.c
>--- mrtg-2.14.5.orig/src/rateup.c	2006-07-14 04:39:19.000000000 -0700
>+++ mrtg-2.14.5/src/rateup.c	2008-03-08 13:52:09.000000000 -0800
>@@ -110,6 +110,7 @@
> char bufftime[32];
> 
> char *short_si_def[] = { "", "k", "M", "G", "T" };
>+int kMGnumber = 4;
> char **short_si = short_si_def;
> char *longup = NULL;
> char *shortup = NULL;
>@@ -153,7 +154,7 @@
> 
> long long kilo = (long long) 1000;
> char *kMG = (char *) NULL;
>-int kMGnumber = 0;
>+
> 
> #define MAXL	200		/* Maximum length of last in & out fields */
> 
>@@ -479,28 +480,16 @@
>         {
>           short_si_out = kMG;
>           kMGnumber = 0;
>+	  short_si[0] = kMG;
>           while ((short_si_out = strchr (short_si_out, ',')) != NULL)
> 	    {
>+	      short_si_out[0] = '\0';
> 	      short_si_out++;
>-	      kMGnumber++;
>+              short_si[++kMGnumber] = short_si_out;
> 	    }
>-
>-          short_si = calloc(kMGnumber + 1, sizeof(*short_si));
>-          short_si_out = kMG;
>-          for (kMGnumber = 0; ; kMGnumber++)
>-            {
>-	      short_si[kMGnumber] = short_si_out;
>-	      short_si_out = strchr(short_si_out, ',');
>-	      if (short_si_out == NULL) break;
>-	      short_si_out++;
>-	    }
>-	}
>-    }
>-  else
>-    {
>-      kMGnumber = 4;
>-    }
>-
>+        }
>+     }
>+  
>   /* mangle the 0.25*maxv value so, that we get a number with either */
>   /* one or two digits != 0 and these digits should be at the  */
>   /* start of the number ... */

Actions: View | Diff

Attachments on bug 436662: 297328 | 297334