return result;
}
- result = a->line - b->line;
-
- if(result) {
- return result;
- } else {
- return a->file ? strcmp(a->file, b->file) : 0;
- }
+ return result = a->line - b->line;
}
void init_configuration(splay_tree_t **config_tree) {
}
void free_config(config_t *cfg) {
- if(cfg->variable) {
- free(cfg->variable);
- }
-
- if(cfg->value) {
- free(cfg->value);
- }
-
- if(cfg->file) {
- free(cfg->file);
- }
-
+ free(cfg->variable);
+ free(cfg->value);
free(cfg);
}
config_t cfg, *found;
cfg.variable = variable;
- cfg.file = NULL;
cfg.line = 0;
found = splay_search_closest_greater(config_tree, &cfg);
return true;
}
- logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in line %d",
+ cfg->variable, cfg->line);
return false;
}
return true;
}
- logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in line %d",
+ cfg->variable, cfg->line);
return false;
}
return true;
}
- logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in %s line %d",
- cfg->variable, cfg->file, cfg->line);
+ logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in line %d",
+ cfg->variable, cfg->line);
return false;
}
cfg = new_config();
cfg->variable = xstrdup(variable);
cfg->value = xstrdup(value);
- cfg->file = xstrdup(fname);
cfg->line = lineno;
return cfg;
char tmpname[PATH_MAX];
bool error = false;
- if (snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name) >= PATH_MAX) {
+ if(snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name) >= PATH_MAX) {
logger(mesh, MESHLINK_ERROR, "Filename too long: %s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
return false;
}
- if (snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename) >= PATH_MAX) {
+ if(snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename) >= PATH_MAX) {
logger(mesh, MESHLINK_ERROR, "Filename too long: %s.tmp", filename);
return false;
}