in some environments.
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@707
a5681a0c-68f1-0310-ab6d-
d61299d08faa
unsigned short CDP_scratch_idx, FILE *rrd_file,
info_t *pcdp_summary, time_t *rra_time);
#endif
unsigned short CDP_scratch_idx, FILE *rrd_file,
info_t *pcdp_summary, time_t *rra_time);
#endif
-int rrd_update_r(char *filename, char *template, int argc, char **argv);
-int _rrd_update(char *filename, char *template, int argc, char **argv,
+int rrd_update_r(char *filename, char *tmplt, int argc, char **argv);
+int _rrd_update(char *filename, char *tmplt, int argc, char **argv,
info_t*);
#define IFDNAN(X,Y) (isnan(X) ? (Y) : (X));
info_t*);
#define IFDNAN(X,Y) (isnan(X) ? (Y) : (X));
info_t *rrd_update_v(int argc, char **argv)
{
info_t *rrd_update_v(int argc, char **argv)
{
info_t *result = NULL;
infoval rc;
optind = 0; opterr = 0; /* initialize getopt */
info_t *result = NULL;
infoval rc;
optind = 0; opterr = 0; /* initialize getopt */
goto end_tag;
}
result = info_push(NULL,sprintf_alloc("return_value"),RD_I_INT,rc);
goto end_tag;
}
result = info_push(NULL,sprintf_alloc("return_value"),RD_I_INT,rc);
- rc.u_int = _rrd_update(argv[optind], template,
+ rc.u_int = _rrd_update(argv[optind], tmplt,
argc - optind - 1, argv + optind + 1, result);
result->value.u_int = rc.u_int;
end_tag:
argc - optind - 1, argv + optind + 1, result);
result->value.u_int = rc.u_int;
end_tag:
int
rrd_update(int argc, char **argv)
{
int
rrd_update(int argc, char **argv)
{
int rc;
optind = 0; opterr = 0; /* initialize getopt */
while (1) {
static struct option long_options[] =
{
int rc;
optind = 0; opterr = 0; /* initialize getopt */
while (1) {
static struct option long_options[] =
{
- {"template", required_argument, 0, 't'},
+ {"tmplt", required_argument, 0, 't'},
{0,0,0,0}
};
int option_index = 0;
{0,0,0,0}
};
int option_index = 0;
- rc = rrd_update_r(argv[optind], template,
+ rc = rrd_update_r(argv[optind], tmplt,
argc - optind - 1, argv + optind + 1);
return rc;
}
int
argc - optind - 1, argv + optind + 1);
return rc;
}
int
-rrd_update_r(char *filename, char *template, int argc, char **argv)
+rrd_update_r(char *filename, char *tmplt, int argc, char **argv)
- return _rrd_update(filename, template, argc, argv, NULL);
+ return _rrd_update(filename, tmplt, argc, argv, NULL);
-_rrd_update(char *filename, char *template, int argc, char **argv,
+_rrd_update(char *filename, char *tmplt, int argc, char **argv,
* cdp values */
long *tmpl_idx; /* index representing the settings
* cdp values */
long *tmpl_idx; /* index representing the settings
- transported by the template index */
+ transported by the tmplt index */
unsigned long tmpl_cnt = 2; /* time and data */
FILE *rrd_file;
unsigned long tmpl_cnt = 2; /* time and data */
FILE *rrd_file;
fclose(rrd_file);
return(-1);
}
fclose(rrd_file);
return(-1);
}
- /* initialize template redirector */
+ /* initialize tmplt redirector */
/* default config example (assume DS 1 is a CDEF DS)
tmpl_idx[0] -> 0; (time)
tmpl_idx[1] -> 1; (DS 0)
/* default config example (assume DS 1 is a CDEF DS)
tmpl_idx[0] -> 0; (time)
tmpl_idx[1] -> 1; (DS 0)
+ if (tmplt) {
+ /* we should work on a writeable copy here */
char *dsname;
unsigned int tmpl_len;
char *dsname;
unsigned int tmpl_len;
+ tmplt = strdup(tmplt);
+ dsname = tmplt;
tmpl_cnt = 1; /* the first entry is the time */
tmpl_cnt = 1; /* the first entry is the time */
- tmpl_len = strlen(template);
+ tmpl_len = strlen(tmplt);
for(i=0;i<=tmpl_len ;i++) {
for(i=0;i<=tmpl_len ;i++) {
- if (template[i] == ':' || template[i] == '\0') {
- template[i] = '\0';
+ if (tmplt[i] == ':' || tmplt[i] == '\0') {
+ tmplt[i] = '\0';
if (tmpl_cnt>rrd.stat_head->ds_cnt){
if (tmpl_cnt>rrd.stat_head->ds_cnt){
- rrd_set_error("Template contains more DS definitions than RRD");
+ rrd_set_error("tmplt contains more DS definitions than RRD");
free(updvals); free(pdp_temp);
free(tmpl_idx); rrd_free(&rrd);
fclose(rrd_file); return(-1);
free(updvals); free(pdp_temp);
free(tmpl_idx); rrd_free(&rrd);
fclose(rrd_file); return(-1);
if ((tmpl_idx[tmpl_cnt++] = ds_match(&rrd,dsname)) == -1){
rrd_set_error("unknown DS name '%s'",dsname);
free(updvals); free(pdp_temp);
if ((tmpl_idx[tmpl_cnt++] = ds_match(&rrd,dsname)) == -1){
rrd_set_error("unknown DS name '%s'",dsname);
free(updvals); free(pdp_temp);
free(tmpl_idx); rrd_free(&rrd);
fclose(rrd_file); return(-1);
} else {
/* the first element is always the time */
tmpl_idx[tmpl_cnt-1]++;
free(tmpl_idx); rrd_free(&rrd);
fclose(rrd_file); return(-1);
} else {
/* the first element is always the time */
tmpl_idx[tmpl_cnt-1]++;
- /* go to the next entry on the template */
- dsname = &template[i+1];
+ /* go to the next entry on the tmplt */
+ dsname = &tmplt[i+1];
/* fix the damage we did before */
if (i<tmpl_len) {
/* fix the damage we did before */
if (i<tmpl_len) {
}
if ((pdp_new = malloc(sizeof(rrd_value_t)
*rrd.stat_head->ds_cnt))==NULL){
}
if ((pdp_new = malloc(sizeof(rrd_value_t)
*rrd.stat_head->ds_cnt))==NULL){