Attachment #340606 for bug #459836

View | Details | Raw Unified | Return to bug 459836
Collapse All | Expand All




		g->scale = defscale;
		if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height, &g->width, &g->first_colour, &g->last_colour) == 5) {
			return strndup(buf, text_buffer_size);
		}
		buf[0] = '\0';
		g->height = default_graph_height;
		g->width = default_graph_width;
		if (sscanf(args, "%x %x %u", &g->first_colour, &g->last_colour, &g->scale) == 3) {
			return NULL;
		}
		g->scale = defscale;
		if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour) == 2) {

Return to bug 459836

Lines 186-197 Link Here

(-)conky-1.9.0/src/specials.c (-2 / +2 lines)
186	g->scale = defscale;	186	g->scale = defscale;
187	if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height, &g->width, &g->first_colour, &g->last_colour) == 5) {	187	if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height, &g->width, &g->first_colour, &g->last_colour) == 5) {
188	return strndup(buf, text_buffer_size);	188	return strndup(buf, text_buffer_size);
189	}	189	}
190	buf[0] = '\0';	190	buf[0] = '\0';
191	g->height = 25;	191	g->height = default_graph_height;
192	g->width = 0;	192	g->width = default_graph_width;
193	if (sscanf(args, "%x %x %u", &g->first_colour, &g->last_colour, &g->scale) == 3) {	193	if (sscanf(args, "%x %x %u", &g->first_colour, &g->last_colour, &g->scale) == 3) {
194	return NULL;	194	return NULL;
195	}	195	}
196	g->scale = defscale;	196	g->scale = defscale;
197	if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour) == 2) {	197	if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour) == 2) {