int rrd_parse_find_gf(
const char *const,
unsigned int *const,
- graph_desc_t * const);
+ graph_desc_t *const);
int rrd_parse_legend(
const char *const,
unsigned int *const,
- graph_desc_t * const);
+ graph_desc_t *const);
int rrd_parse_color(
const char *const,
- graph_desc_t * const);
+ graph_desc_t *const);
int rrd_parse_CF(
const char *const,
unsigned int *const,
- graph_desc_t * const,
+ graph_desc_t *const,
enum cf_en *const);
int rrd_parse_print(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_shift(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_xport(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_PVHLAST(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_make_vname(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_find_vname(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_def(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_vdef(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_cdef(
const char *const,
unsigned int *const,
- graph_desc_t * const,
- image_desc_t * const);
+ graph_desc_t *const,
+ image_desc_t *const);
int rrd_parse_find_gf(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp)
+ graph_desc_t *const gdp)
{
char funcname[11], c1 = 0;
int i = 0;
int rrd_parse_legend(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp)
+ graph_desc_t *const gdp)
{
int i;
int rrd_parse_color(
const char *const string,
- graph_desc_t * const gdp)
+ graph_desc_t *const gdp)
{
unsigned int r = 0, g = 0, b = 0, a = 0, i;
default:
return 1; /* wrong number of digits */
}
- gdp->col = r << 24 | g << 16 | b << 8 | a;
+ gdp->col = gfx_hex_to_col(r << 24 | g << 16 | b << 8 | a);
return 0;
}
int rrd_parse_CF(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
+ graph_desc_t *const gdp,
enum cf_en *cf)
{
char symname[CF_NAM_SIZE];
int rrd_parse_find_vname(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
char tmpstr[MAX_VNAME_LEN + 1];
int i;
int rrd_parse_print(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
/* vname:CF:format in case of DEF-based vname
** vname:CF:format in case of CDEF-based vname
int rrd_parse_shift(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
int i;
int rrd_parse_xport(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
if ((gdp->vidx = rrd_parse_find_vname(line, eaten, gdp, im)) < 0)
return 1;
int rrd_parse_PVHLAST(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
int i, j, k;
int colorfound = 0;
static int spacecnt = 0;
if (spacecnt == 0) {
- float one_space = gfx_get_text_width(im->canvas, 0,
+ float one_space = gfx_get_text_width(im, 0,
im->
text_prop[TEXT_PROP_LEGEND].
font,
im->
text_prop[TEXT_PROP_LEGEND].
size,
- im->tabwidth, " ",
- 0) / 4.0;
- float target_space = gfx_get_text_width(im->canvas, 0,
+ im->tabwidth, " ") / 4.0;
+ float target_space = gfx_get_text_width(im, 0,
im->
text_prop
[TEXT_PROP_LEGEND].font,
im->
text_prop
[TEXT_PROP_LEGEND].size,
- im->tabwidth, "oo", 0);
+ im->tabwidth, "oo");
spacecnt = target_space / one_space;
dprintf("- spacecnt: %i onespace: %f targspace: %f\n", spacecnt,
rrd_set_error("Could not parse color in '%s'", &tmpstr[j]);
return 1;
}
- dprintf("- parsed color 0x%08x\n", (unsigned int) gdp->col);
+ dprintf("- parsed color %0.0f,%0.0f,%0.0f,%0.0f\n", gdp->col.red,
+ gdp->col.green, gdp->col.blue, gdp->col.alpha);
colorfound = 1;
} else {
dprintf("- no color present in '%s'\n", tmpstr);
int rrd_parse_make_vname(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
char tmpstr[MAX_VNAME_LEN + 10];
int i = 0;
int rrd_parse_def(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
int i = 0;
char command[7]; /* step, start, end, reduce */
int rrd_parse_vdef(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
char tmpstr[MAX_VNAME_LEN + 1]; /* vname\0 */
int i = 0;
int rrd_parse_cdef(
const char *const line,
unsigned int *const eaten,
- graph_desc_t * const gdp,
- image_desc_t * const im)
+ graph_desc_t *const gdp,
+ image_desc_t *const im)
{
dprintf("- parsing '%s'\n", &line[*eaten]);
if (rrd_parse_make_vname(line, eaten, gdp, im))
void rrd_graph_script(
int argc,
char *argv[],
- image_desc_t * const im,
+ image_desc_t *const im,
int optno)
{
int i;
break;
}
if (gdp->debug) {
- dprintf("used %i out of %i chars\n", eaten, strlen(argv[i]));
+ dprintf("used %i out of %zi chars\n", eaten, strlen(argv[i]));
dprintf("parsed line: '%s'\n", argv[i]);
dprintf("remaining: '%s'\n", &argv[i][eaten]);
if (eaten >= strlen(argv[i]))