From: Dennis Schafroth Date: Fri, 20 Apr 2012 08:34:36 +0000 (+0200) Subject: Fix C99 warnings. Remove static on settings_lookup_offset X-Git-Tag: v1.6.13~23^2~10 X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=76c21d428775e02c8b095d6b12f3d5ab323cf0fe;p=pazpar2-moved-to-github.git Fix C99 warnings. Remove static on settings_lookup_offset --- diff --git a/src/settings.c b/src/settings.c index 5921e0a..ccf7b61 100644 --- a/src/settings.c +++ b/src/settings.c @@ -140,7 +140,7 @@ int settings_create_offset(struct conf_service *service, const char *name) return settings_index_lookup(service->dictionary, name, service->nmem); } -static int settings_lookup_offset(struct conf_service *service, const char *name) +int settings_lookup_offset(struct conf_service *service, const char *name) { return settings_index_lookup(service->dictionary, name, 0); } @@ -505,8 +505,6 @@ static void initialize_hard_settings(struct conf_service *service) void initialize_soft_settings(struct conf_service *service) { int i; - yaz_log(YLOG_LOG, "Init soft settings"); - for (i = 0; i < service->num_metadata; i++) { struct conf_metadata *md = &service->metadata[i]; @@ -516,20 +514,22 @@ void initialize_soft_settings(struct conf_service *service) // Also create setting for some metadata attributes. if (md->limitmap) { - yaz_log(YLOG_LOG, "Metadata %s has limitmap: %s ",md->name, md->limitmap); + int index; WRBUF wrbuf = wrbuf_alloc(); + yaz_log(YLOG_DEBUG, "Metadata %s has limitmap: %s ",md->name, md->limitmap); wrbuf_printf(wrbuf, "pz:limitmap:%s", md->name); - int index = settings_create_offset(service, wrbuf_cstr(wrbuf)); + index = settings_create_offset(service, wrbuf_cstr(wrbuf)); if (index >= 0) { - yaz_log(YLOG_LOG, "Service %s default %s=%s", - (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap); struct setting new; + int offset; + yaz_log(YLOG_DEBUG, "Service %s default %s=%s", + (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap); new.name = (char *) wrbuf_cstr(wrbuf); new.value = md->limitmap; new.next = 0; new.target = 0; new.precedence = 0; - int offset = settings_create_offset(service, new.name); + offset = settings_create_offset(service, new.name); update_settings(&new, service->settings, offset, service->nmem); } wrbuf_destroy(wrbuf);