From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 26 Jan 2010 14:37:43 +0000 (+0100)
Subject: Avoid mixed stmt/var declare
X-Git-Tag: v1.4.0~159
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a84ae03dc14334568c27ce24bfec11146d0bb44f;p=pazpar2-moved-to-github.git

Avoid mixed stmt/var declare
---

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 0771c2c..870151a 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -707,6 +707,7 @@ static struct conf_server *server_create(struct conf_config *config,
 {
     xmlNode *n;
     struct conf_server *server = nmem_malloc(nmem, sizeof(struct conf_server));
+    xmlChar *server_id = xmlGetProp(node, (xmlChar *) "id");
 
     server->host = 0;
     server->port = 0;
@@ -722,7 +723,6 @@ static struct conf_server *server_create(struct conf_config *config,
     server->mergekey_pct = 0;
     server->server_settings = 0;
 
-    xmlChar *server_id = xmlGetProp(node, (xmlChar *) "id");
     if (server_id)
         server->server_id = nmem_strdup(nmem, (const char *)server_id);
     else