Sun, 15 Jan 2017 18:27:09 +0100
removes some unused stuff
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "initconf.h" InitConfig *load_init_config(char *file) { FILE *in = fopen(file, "r"); if(in == NULL) { return NULL; } InitConfig *conf = malloc(sizeof(InitConfig)); conf->parser.parse = initconf_parse; conf->file = file; conf->directives = NULL; int r = cfg_parse_basic_file((ConfigParser*)conf, in); if(r != 0) { free_init_config(conf); return NULL; } fclose(in); return conf; } void free_init_config(InitConfig *conf) { ucx_mempool_destroy(conf->parser.mp->pool); free(conf); } int initconf_parse(void *p, ConfigLine *begin, ConfigLine *end, sstr_t line) { InitConfig *conf = p; // parse directive ConfigDirective *d = cfg_parse_directive(line, conf->parser.mp); if(d == NULL) { log_ereport(LOG_FAILURE, "initconf_parse: directive is null"); return 0; } d->begin = begin; d->end = end; if(d->type_num == INIT_DIRECTIVE) { conf->directives = ucx_list_append(conf->directives, d); } else { log_ereport(LOG_WARN, "Non Init directive in init.conf"); } return 0; }