Fri, 01 Nov 2024 12:25:52 +0100
fix pgext uses a wrong field number, if the column has the same name as a resource or property column
/* * 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 "../public/nsapi.h" #include <cx/string.h> #include "httplistener.h" #include "log.h" #include "configmanager.h" static ServerConfiguration *current_config = NULL; static conf_global_vars_s global_vars; void init_configuration_manager() { /* init parser */ init_server_config_parser(); } NSAPI_PUBLIC conf_global_vars_s* conf_getglobals() { return &global_vars; } int cfgmgr_load_config(CfgManager *mgr) { ZERO(mgr, sizeof(CfgManager)); ServerConfiguration *config = load_server_conf(mgr, "config/server.conf"); if(!config) { log_ereport(LOG_FAILURE, "cfgmgr: cannot load server config file %s", "config/server.conf"); return 1; } mgr->cfg = config; return 0; } int cfgmgr_apply_config(CfgManager *mgr) { // stage 2 config loading if(!apply_server_conf(mgr)) { log_ereport(LOG_FAILURE, "cfgmgr: stage 2 config loading failed"); return 1; } // some extra steps required if there is already a configuration loaded if(current_config) { if(migrate_server_conf(current_config, mgr->cfg)) { log_ereport(LOG_FAILURE, "cfgmgr: config migration failed"); return 1; } cfg_unref(current_config); } current_config = mgr->cfg; return 0; } ServerConfiguration *cfgmgr_get_server_config() { return current_config; }