1 |
pva 08/11/04 19:32:18 |
2 |
|
3 |
Added: rrdtool-1.2.28-revert-font-fix.patch |
4 |
Log: |
5 |
Revert upstream changes that cause broken graphs in cacti, bug #245331, thank Thomas Beutin for report and fleg for tests. Remove unused. |
6 |
(Portage version: 2.2_rc13/cvs/Linux 2.6.26-openvz.git-35f41f1 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.2.28-revert-font-fix.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: rrdtool-1.2.28-revert-font-fix.patch |
15 |
=================================================================== |
16 |
=== modified file 'src/rrd_graph.c' |
17 |
--- src/rrd_graph.c 2008-11-04 14:50:21 +0000 |
18 |
+++ src/rrd_graph.c 2008-11-04 14:57:04 +0000 |
19 |
@@ -3508,17 +3508,15 @@ |
20 |
if (size > 0){ |
21 |
im->text_prop[propidx].size=size; |
22 |
} |
23 |
- if (strlen(optarg) > end){ |
24 |
- if (optarg[end] == ':'){ |
25 |
- strncpy(im->text_prop[propidx].font,optarg+end+1,255); |
26 |
+ if (strlen(prop) > end){ |
27 |
+ if (prop[end] == ':'){ |
28 |
+ strncpy(im->text_prop[propidx].font,prop+end+1,255); |
29 |
im->text_prop[propidx].font[255] = '\0'; |
30 |
} else { |
31 |
- rrd_set_error("expected : after font size in '%s'",optarg); |
32 |
+ rrd_set_error("expected after font size in '%s'",prop); |
33 |
return; |
34 |
} |
35 |
} |
36 |
- /* only run the for loop for DEFAULT (0) for |
37 |
- all others, we break here. woodo programming */ |
38 |
if (propidx==sindex && sindex != 0) break; |
39 |
} |
40 |
} else { |