Fix crash in record conv rule select YAZ-812

[yaz-moved-to-github.git] / src / iso5428.c

diff --git a/src/iso5428.c b/src/iso5428.c
index 90cc782..8d7b3c2 100644 (file)
--- a/src/iso5428.c
+++ b/src/iso5428.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -14,7 +14,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "iconv-p.h"
 
@@ -42,7 +41,7 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
         inp++;
         --inbytesleft;
         (*no_read)++;
-    }    
+    }
     if (inbytesleft == 0)
     {
         yaz_iconv_set_errno(cd, YAZ_ICONV_EINVAL); /* incomplete input */
@@ -51,15 +50,15 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
     }
     switch (*inp) {
     case 0xe1: /*  alpha small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ac;
-            else 
+            else
                 x = 0x03b1;
             break;
     case 0xc1: /*  alpha capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x0386;
-            else 
+            else
                 x = 0x0391;
             break;
 
@@ -84,15 +83,15 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
             x = 0x0394;
             break;
     case 0xe6: /*  epsilon small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ad;
-            else 
+            else
                 x = 0x03b5;
             break;
     case 0xc6: /*  epsilon capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x0388;
-            else 
+            else
                 x = 0x0395;
             break;
     case 0xe9: /*  Zeta small */
@@ -102,15 +101,15 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
             x = 0x0396;
             break;
     case 0xea: /*  Eta small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ae;
-            else 
+            else
                 x = 0x03b7;
             break;
     case 0xca: /*  Eta capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x0389;
-            else 
+            else
                 x = 0x0397;
             break;
     case 0xeb: /*  Theta small */
@@ -120,24 +119,24 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
             x = 0x0398;
             break;
     case 0xec: /*  Iota small */
-            if (tonos) 
-                if (dialitika) 
+            if (tonos)
+                if (dialitika)
                     x = 0x0390;
-                else 
+                else
                     x = 0x03af;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03ca;
-                else 
+                else
                     x = 0x03b9;
             break;
     case 0xcc: /*  Iota capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038a;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03aa;
-                else 
+                else
                     x = 0x0399;
             break;
     case 0xed: /*  Kappa small */
@@ -171,15 +170,15 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
             x = 0x039e;
             break;
     case 0xf2: /*  Omicron small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03cc;
-            else 
+            else
                 x = 0x03bf;
             break;
     case 0xd2: /*  Omicron capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038c;
-            else 
+            else
                 x = 0x039f;
             break;
     case 0xf3: /*  Pi small */
@@ -210,24 +209,24 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
             x = 0x03a4;
             break;
     case 0xf9: /*  Upsilon small */
-            if (tonos) 
-                if (dialitika) 
+            if (tonos)
+                if (dialitika)
                     x = 0x03b0;
-                else 
+                else
                     x = 0x03cd;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03cb;
-                else 
+                else
                     x = 0x03c5;
             break;
     case 0xd9: /*  Upsilon capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038e;
-            else 
-                if (dialitika) 
+            else
+                if (dialitika)
                     x = 0x03ab;
-                else 
+                else
                     x = 0x03a5;
             break;
     case 0xfa: /*  Phi small */
@@ -249,15 +248,15 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
             x = 0x03a8;
             break;
     case 0xfd: /*  Omega small */
-            if (tonos) 
+            if (tonos)
                 x = 0x03ce;
-            else 
+            else
                 x = 0x03c9;
             break;
     case 0xdd: /*  Omega capital */
-            if (tonos) 
+            if (tonos)
                 x = 0x038f;
-            else 
+            else
                 x = 0x03a9;
             break;
     default:
@@ -265,7 +264,7 @@ static unsigned long read_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_decoder_t d,
         break;
     }
     (*no_read)++;
-    
+
     return x;
 }
 
@@ -357,7 +356,7 @@ static size_t write_iso_5428_1984(yaz_iconv_t cd, yaz_iconv_encoder_t en,
             yaz_iconv_set_errno(cd, YAZ_ICONV_EILSEQ);
             return (size_t) -1;
         }
-        out[k++] = x;
+        out[k++] = (unsigned char ) x;
         break;
     }
     *outbytesleft -= k;
@@ -394,7 +393,9 @@ yaz_iconv_decoder_t yaz_iso_5428_decoder(const char *name,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+