From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 24 Sep 2007 12:51:10 +0000 (+0000)
Subject: Fixed bug with shadowing of variable in lookup_marc8. Bug introduced
X-Git-Tag: YAZ.3.0.15.snap.5.oct~4
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=386fc8aa64d01486aa4fb3dac0dde1003a3b3d3f;p=yaz-moved-to-github.git

Fixed bug with shadowing of variable in lookup_marc8. Bug introduced
in previous commit (1.44).
---

diff --git a/src/siconv.c b/src/siconv.c
index 5255748..a770a6c 100644
--- a/src/siconv.c
+++ b/src/siconv.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: siconv.c,v 1.44 2007-09-22 18:49:55 adam Exp $
+ * $Id: siconv.c,v 1.45 2007-09-24 12:51:10 adam Exp $
  */
 /**
  * \file siconv.c
@@ -1443,6 +1443,8 @@ static unsigned long lookup_marc8(yaz_iconv_t cd,
         cd->my_errno = YAZ_ICONV_EILSEQ;
         return 0;
     }
+    else if (x == ' ')
+        return x;
     else
     {
         unsigned char *inp;
@@ -1453,9 +1455,6 @@ static unsigned long lookup_marc8(yaz_iconv_t cd,
         inp = (unsigned char *) utf8_buf;
         inbytesleft = strlen(utf8_buf);
 
-        if (x == ' ')
-            return x;
-        
         x = yaz_marc8r_42_conv(inp, inbytesleft, &no_read_sub, comb);
         if (x)
         {