rpms
/
rrdtool
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Nuke some old junk

This commit is contained in:
Jarod Wilson 2008-03-16 23:14:37 +00:00
parent f7c5652f57
commit 4093f51e54
2 changed files with 0 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
rrdtool-1.3-beta3-plug-mem-leak.patch
View File

@ -1,156 +0,0 @@
Index: program/src/rrd_update.c
===================================================================
--- program/src/rrd_update.c (revision 1228)
+++ program/src/rrd_update.c (revision 1277)
@@ -1964,5 +1964,5 @@
rrd_file->pos, rrd->rra_def[rra_idx].cf_nam);
#endif
- if (pcdp_summary != NULL) {
+ if (*pcdp_summary != NULL) {
iv.u_val = rrd->cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val;
/* append info to the return hash */
Index: program/src/rrd_create.c
===================================================================
--- program/src/rrd_create.c (revision 1271)
+++ program/src/rrd_create.c (revision 1278)
@@ -122,5 +122,5 @@
if ((rrd.stat_head = calloc(1, sizeof(stat_head_t))) == NULL) {
rrd_set_error("allocating rrd.stat_head");
- rrd_free(&rrd);
+ free(rrd.stat_head);
return (-1);
}
@@ -129,5 +129,6 @@
if ((rrd.live_head = calloc(1, sizeof(live_head_t))) == NULL) {
rrd_set_error("allocating rrd.live_head");
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return (-1);
}
@@ -162,5 +163,6 @@
NULL) {
rrd_set_error("allocating rrd.ds_def");
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return (-1);
}
@@ -194,5 +196,6 @@
}
if (rrd_test_error()) {
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return -1;
}
@@ -217,5 +220,6 @@
if (rrd_test_error()) {
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return -1;
}
@@ -230,5 +234,6 @@
NULL) {
rrd_set_error("allocating rrd.rra_def");
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return (-1);
}
@@ -481,5 +486,6 @@
/* all errors are unrecoverable */
free(argvcopy);
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return (-1);
}
@@ -508,5 +514,6 @@
-1) {
rrd_set_error("creating contingent RRA");
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return -1;
}
@@ -515,5 +522,6 @@
} else {
rrd_set_error("can't parse argument '%s'", argv[i]);
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return -1;
}
@@ -523,5 +531,6 @@
if (rrd.stat_head->rra_cnt < 1) {
rrd_set_error("you must define at least one Round Robin Archive");
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return (-1);
}
@@ -529,5 +538,6 @@
if (rrd.stat_head->ds_cnt < 1) {
rrd_set_error("you must define at least one Data Source");
- rrd_free(&rrd);
+ free(rrd.stat_head);
+ free(rrd.live_head);
return (-1);
}
@@ -665,5 +675,6 @@
if ((rrd_file = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) {
rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
- rrd_free(rrd);
+ free(rrd->stat_head);
+ free(rrd->live_head);
return (-1);
}
@@ -680,5 +691,6 @@
if ((rrd->pdp_prep = calloc(1, sizeof(pdp_prep_t))) == NULL) {
rrd_set_error("allocating pdp_prep");
- rrd_free(rrd);
+ free(rrd->stat_head);
+ free(rrd->live_head);
close(rrd_file);
return (-1);
@@ -696,5 +708,6 @@
if ((rrd->cdp_prep = calloc(1, sizeof(cdp_prep_t))) == NULL) {
rrd_set_error("allocating cdp_prep");
- rrd_free(rrd);
+ free(rrd->stat_head);
+ free(rrd->live_head);
close(rrd_file);
return (-1);
@@ -743,5 +756,6 @@
if ((rrd->rra_ptr = calloc(1, sizeof(rra_ptr_t))) == NULL) {
rrd_set_error("allocating rra_ptr");
- rrd_free(rrd);
+ free(rrd->stat_head);
+ free(rrd->live_head);
close(rrd_file);
return (-1);
@@ -760,5 +774,6 @@
if ((unknown = (rrd_value_t *) malloc(512 * sizeof(rrd_value_t))) == NULL) {
rrd_set_error("allocating unknown");
- rrd_free(rrd);
+ free(rrd->stat_head);
+ free(rrd->live_head);
close(rrd_file);
return (-1);
@@ -778,5 +793,6 @@
free(unknown);
fdatasync(rrd_file);
- rrd_free(rrd);
+ free(rrd->stat_head);
+ free(rrd->live_head);
if (close(rrd_file) == -1) {
rrd_set_error("creating rrd: %s", rrd_strerror(errno));
@@ -786,4 +802,5 @@
rrd_file_dn = rrd_open(file_name, &rrd_dn, RRD_READONLY);
rrd_dontneed(rrd_file_dn, &rrd_dn);
+ rrd_free(&rrd_dn);
rrd_close(rrd_file_dn);
return (0);

33
rrdtool-1.3-beta3-text-align.patch
View File

@ -1,33 +0,0 @@
Index: rrdtool/src/rrd_gfx.c
===================================================================
--- rrdtool/src/rrd_gfx.c (revision 1183)
+++ rrdtool/src/rrd_gfx.c (revision 1264)
@@ -147,5 +147,7 @@
pango_context = pango_layout_get_context(layout);
pango_cairo_context_set_font_options(pango_context, im->font_options);
- pango_cairo_update_context(cr, pango_context);
+ pango_cairo_context_set_resolution(pango_context,100);
+
+/* pango_cairo_update_context(cr, pango_context); */
pango_layout_set_tabs(layout, tab_array);
Index: rrdtool/src/rrd_graph.c
===================================================================
--- rrdtool/src/rrd_graph.c (revision 1262)
+++ rrdtool/src/rrd_graph.c (revision 1264)
@@ -341,5 +341,5 @@
cairo_surface_destroy(im->surface);
if (status)
- fprintf(stderr, "OOPS: Cairo has issuesm it can't even die: %s\n",
+ fprintf(stderr, "OOPS: Cairo has issues it can't even die: %s\n",
cairo_status_to_string(status));
@@ -3032,7 +3032,7 @@
};
im->cr = cairo_create(im->surface);
- pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100);
cairo_set_antialias(im->cr, im->graph_antialias);
cairo_scale(im->cr, im->zoom, im->zoom);
+ pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100);
gfx_new_area(im,