From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 5 Jun 2012 06:16:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.2.34~3^2~2
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=19e0683f8919ec86f6340c1667da495328ec899a;hp=-c

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

19e0683f8919ec86f6340c1667da495328ec899a
diff --combined src/zoom-c.c
index 7b19d07,58afbbf..c1dc652
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@@ -419,7 -419,6 +419,6 @@@ ZOOM_API(void
          c->tproxy = xstrdup(val);
      }
  
- 
      xfree(c->charset);
      c->charset = 0;
      val = ZOOM_options_get(c->options, "charset");
@@@ -466,20 -465,22 +465,22 @@@
          char *pcomma;
          char *pequals;
          while ((pcomma = strchr(remainder, ',')) != 0 &&
-                (pcolon == 0 || pcomma < pcolon)) {
+                (pcolon == 0 || pcomma < pcolon))
+         {
              *pcomma = '\0';
-             if ((pequals = strchr(remainder, '=')) != 0) {
+             if ((pequals = strchr(remainder, '=')) != 0)
+             {
                  *pequals = '\0';
-                 /*printf("# setting '%s'='%s'\n", remainder, pequals+1);*/
                  ZOOM_connection_option_set(c, remainder, pequals+1);
              }
              remainder = pcomma+1;
          }
  
-         if (remainder != c->host_port) {
+         if (remainder != c->host_port)
+         {
+             remainder = xstrdup(remainder);
              xfree(c->host_port);
-             c->host_port = xstrdup(remainder);
-             /*printf("# reset hp='%s'\n", remainder);*/
+             c->host_port = remainder;
          }
      }
  
@@@ -1028,7 -1029,7 +1029,7 @@@ ZOOM_API(ZOOM_facet_field *
  }
  
  ZOOM_API(const char**)
 -    ZOOM_resultset_facet_names(ZOOM_resultset r)
 +    ZOOM_resultset_facets_names(ZOOM_resultset r)
  {
      return (const char **) r->facets_names;
  }