From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 17 Apr 2014 18:40:56 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
X-Git-Tag: v2.0.59~1
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=a05fd4d93f41fc3e6fe5d0cc8bd8f9d7a6410cb5;hp=0dedb6a7a6a0f0ddaf56cb0673978fdd85e64be1

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

diff --git a/rset/rset.c b/rset/rset.c
index f653a21..f64ff45 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -343,13 +343,11 @@ TERMID rset_term_create(const char *name, int length, const char *flags,
 			zint hits_limit, const char *ref_id)
 
 {
-    TERMID t;
-    yaz_log (log_level, "term_create '%s' %d f=%s type=%d nmem=%p",
-            name, length, flags, type, nmem);
-    t= (TERMID) nmem_malloc(nmem, sizeof(*t));
+    TERMID t = (TERMID) nmem_malloc(nmem, sizeof(*t));
+
     if (!name)
-        t->name = NULL;
-    else if (length == -1)
+        name = "";
+    if (length == -1)
         t->name = nmem_strdup(nmem, name);
     else
 	t->name = nmem_strdupn(nmem, name, length);