X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmarcdisp.c;h=a5084ce35a02b81b66b4101200cab5d713f60a6e;hp=2f5f0d513e9fdbd537b0b960bf9406464bb9364b;hb=a5ac9b8b5662012c69c5e7e5287c5ffc0c7a1f25;hpb=3fa6bf34c5496f69a63469a3184251d38758c85d

diff --git a/src/marcdisp.c b/src/marcdisp.c
index 2f5f0d5..a5084ce 100644
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -467,7 +467,7 @@ int yaz_marc_write_line(yaz_marc_t mt, WRBUF wr)
                    the code is a single character .. However we've
                    seen multibyte codes, so see how big it really is */
                 size_t using_code_len = 
-                    (identifier_length != 2) ? identifier_length - 1
+                    (identifier_length > 2) ? identifier_length - 1
                     :
                     cdata_one_character(mt, s->code_data);
                 
@@ -616,7 +616,7 @@ static int yaz_marc_write_marcxml_ns1(yaz_marc_t mt, WRBUF wr,
                    the code is a single character .. However we've
                    seen multibyte codes, so see how big it really is */
                 size_t using_code_len = 
-                    (identifier_length != 2) ? identifier_length - 1
+                    (identifier_length > 2) ? identifier_length - 1
                     :
                     cdata_one_character(mt, s->code_data);
                 
@@ -786,7 +786,7 @@ int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr,
                    the code is a single character .. However we've
                    seen multibyte codes, so see how big it really is */
                 size_t using_code_len = 
-                    (identifier_length != 2) ? identifier_length - 1
+                    (identifier_length > 2) ? identifier_length - 1
                     :
                     cdata_one_character(mt, s->code_data);
 
@@ -1051,7 +1051,7 @@ static int marc_exec_leader(const char *leader_spec, char *leader, size_t size)
         no = sscanf(cp, "%d=%20[^,]%n", &pos, val, &no_read);
         if (no < 2 || no_read < 3)
             return -1;
-        if (pos < 0 || pos >= size)
+        if (pos < 0 || (size_t) pos >= size)
             return -1;
 
         if (*val == '\'')