if ((line = (char *) malloc(length + 2)) == NULL)
return NULL;
if (fgets(line, length + 1, stdin) == NULL) {
- free(line);
+ free(line);
return NULL;
}
} else
strncat(line, tmp, tmplen);
} else {
/* clean-up the storage allocated in previous iteration */
- if (line)
+ if (line) {
free(line);
+ }
if ((line = strdup(tmp)) == NULL)
return NULL;
}
memset(tmp, 0, sizeof(tmp));
}
- if (!line)
+ if (!line) {
return NULL;
+ }
if (line[strlen(line) - 1] == '&')
line[strlen(line) - 1] = '\0';
}
s_cgi *res;
s_var **vars;
- if ((res = (s_cgi *) malloc(sizeof(s_cgi))) == NULL)
+ if ((res = (s_cgi *) malloc(sizeof(s_cgi))) == NULL) {
return NULL;
+ }
vars = rrdcgiReadVariables();
free(template);
template = NULL;
}
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return rc;
}
free(file);
free(sources);
free(file_copy);
- if (dir)
+ if (dir) {
free(dir);
+ }
free(dir2);
return rc;
} /* }}} static int handle_request_create */
while ((opt = optparse_long(&options, longopts, NULL)) != -1) {
switch (opt) {
case 'd':
- if (opt_daemon != NULL)
+ if (opt_daemon != NULL) {
free (opt_daemon);
+ }
opt_daemon = strdup(options.optarg);
if (opt_daemon == NULL)
{
"[--no-header|-n]\n"
"[--daemon|-d address]\n"
"file.rrd [file.xml]", options.argv[0]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return (-1);
break;
}
"[--no-header|-n]\n"
"[--daemon|-d address]\n"
"file.rrd [file.xml]", options.argv[0]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return (-1);
}
rc = rrdc_flush_if_daemon(opt_daemon, options.argv[options.optind]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
if (rc) return (rc);
if ((options.argc - options.optind) == 2) {
case 's':
if ((parsetime_error = rrd_parsetime(options.optarg, &start_tv))) {
rrd_set_error("start time: %s", parsetime_error);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
break;
case 'e':
if ((parsetime_error = rrd_parsetime(options.optarg, &end_tv))) {
rrd_set_error("end time: %s", parsetime_error);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
break;
case 'r':
if ((parsetime_error = rrd_scaled_duration(options.optarg, 1, &step_tmp))) {
rrd_set_error("resolution: %s", parsetime_error);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
break;
case 'd':
- if (opt_daemon != NULL)
+ if (opt_daemon != NULL) {
free (opt_daemon);
+ }
opt_daemon = strdup(options.optarg);
if (opt_daemon == NULL)
{
case '?':
rrd_set_error("%s", options.errmsg);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
}
if (rrd_proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
if (start_tmp < 3600 * 24 * 365 * 10) {
rrd_set_error("the first entry to fetch should be after 1980");
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return (-1);
}
if (end_tmp < start_tmp) {
rrd_set_error("start (%ld) should be less than end (%ld)", start_tmp,
end_tmp);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return (-1);
}
if (options.optind + 1 >= options.argc) {
rrd_set_error("Usage: rrdtool %s <file> <CF> [options]", options.argv[0]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
status = rrd_fetch_r(options.argv[options.optind],
cf, start, end, step, ds_cnt, ds_namv, data);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
if (status != 0)
return (-1);
return (0);
target_rraindex = strtol(options.optarg, &endptr, 0);
if (target_rraindex < 0) {
rrd_set_error("invalid rraindex number");
- if (opt_daemon != NULL) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return (-1);
}
break;
case 'd':
- if (opt_daemon != NULL)
+ if (opt_daemon != NULL) {
free (opt_daemon);
+ }
opt_daemon = strdup(options.optarg);
if (opt_daemon == NULL)
{
break;
case '?':
rrd_set_error("%s", options.errmsg);
- if (opt_daemon != NULL) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return -1;
}
}
rrdc_connect (opt_daemon);
if (rrdc_is_connected (opt_daemon)) {
- if (opt_daemon != NULL) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return rrdc_first(options.argv[options.optind], target_rraindex);
} else {
- if (opt_daemon != NULL) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return rrd_first_r(options.argv[options.optind], target_rraindex);
}
}
case '?':
rrd_set_error("%s", options.errmsg);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
} /* while (opt!=-1) */
{
rrd_set_error("Usage: rrdtool %s [--daemon|-d <addr>] <file> [<file> ...]",
options.argv[0]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
}
int getLong(const char* v,long *val,char**extra,int base) {
- if (extra == NULL)
+ if (extra == NULL) {
return 0;
+ }
/* try to execute the parser */
/* NOTE that this may be a bit different from the original parser */
while ((opt = optparse_long(&options, longopts, NULL)) != -1) {
switch (opt) {
case 'd':
- if (opt_daemon != NULL)
+ if (opt_daemon != NULL) {
free (opt_daemon);
+ }
opt_daemon = strdup(options.optarg);
if (opt_daemon == NULL)
{
case '?':
rrd_set_error("%s", options.errmsg);
- if (opt_daemon) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return NULL;
}
} /* while (opt != -1) */
if (options.argc - options.optind != 1) {
rrd_set_error ("Usage: rrdtool %s [--daemon |-d <addr> [--noflush|-F]] <file>",
options.argv[0]);
- if (opt_daemon) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return NULL;
}
if (flushfirst) {
status = rrdc_flush_if_daemon(opt_daemon, options.argv[options.optind]);
if (status) {
- if (opt_daemon) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return (NULL);
}
}
else
info = rrd_info_r(options.argv[options.optind]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return (info);
} /* rrd_info_t *rrd_info */
while ((opt = optparse_long(&options, longopts, NULL)) != -1) {
switch (opt) {
case 'd':
- if (opt_daemon != NULL)
+ if (opt_daemon != NULL) {
free (opt_daemon);
+ }
opt_daemon = strdup(options.optarg);
if (opt_daemon == NULL)
{
case '?':
rrd_set_error("%s", options.errmsg);
- if (opt_daemon) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return -1;
}
} /* while (opt) */
if ((options.argc - options.optind) != 1) {
rrd_set_error ("Usage: rrdtool %s [--daemon|-d <addr>] <file>",
options.argv[0]);
- if (opt_daemon) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
return -1;
}
else
lastupdate = rrd_last_r(options.argv[options.optind]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return (lastupdate);
}
while ((opt = optparse_long(&options, longopts, NULL)) != -1) {
switch (opt) {
case 'd':
- if (opt_daemon != NULL)
+ if (opt_daemon != NULL) {
free (opt_daemon);
+ }
opt_daemon = strdup(options.optarg);
if (opt_daemon == NULL)
{
case '?':
rrd_set_error("%s", options.errmsg);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return -1;
}
} /* while (opt!=-1) */
if ((options.argc - options.optind) != 1) {
rrd_set_error ("Usage: rrdtool %s [--daemon|-d <addr>] <file>",
options.argv[0]);
- if (opt_daemon) free(opt_daemon);
+ if (opt_daemon != NULL) {
+ free(opt_daemon);
+ }
return (-1);
}
status = rrdc_flush_if_daemon(opt_daemon, options.argv[options.optind]);
- if (opt_daemon) free (opt_daemon);
+ if (opt_daemon != NULL) {
+ free (opt_daemon);
+ }
if (status) return (-1);
status = rrd_lastupdate_r(options.argv[options.optind],
while ((opt = optparse_long(&options,longopts,NULL)) != -1) {
switch (opt) {
case 't':
- if (tmplt) free(tmplt);
+ if (tmplt != NULL) {
+ free(tmplt);
+ }
tmplt = strdup(options.optarg);
break;
break;
case 'd':
- if (opt_daemon != NULL)
+ if (opt_daemon != NULL) {
free (opt_daemon);
+ }
opt_daemon = strdup (options.optarg);
if (opt_daemon == NULL)
{