RPN log: change some types to Odr_int

diff --git a/src/logrpn.c b/src/logrpn.c
index cd8de78..06c675e 100644 (file)
--- a/src/logrpn.c
+++ b/src/logrpn.c
@@ -15,7 +15,7 @@
 #include <yaz/logrpn.h>
 #include <yaz/oid_db.h>
 
-static const char *relToStr(int v)
+static const char *relToStr(Odr_int v)
 {
     const char *str = 0;
     switch (v)
@@ -34,7 +34,7 @@ static const char *relToStr(int v)
     return str;
 }
 
-static void attrStr (int type, int value, char *str)
+static void attrStr (Odr_int type, Odr_int value, char *str)
 {
     const char *rstr;
     *str = '\0';

diff --git a/src/rpn2cql.c b/src/rpn2cql.c
index ef54944..68b359a 100644 (file)
--- a/src/rpn2cql.c
+++ b/src/rpn2cql.c
@@ -168,10 +168,10 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes)
         {
             if (ae->which == Z_AttributeValue_numeric)
             {
-                int truncation = *(ae->value.numeric);
+                Odr_int truncation = *(ae->value.numeric);
                 /* This logic only works for Left, right and both. eg. 1,2,3 */
                if (truncation <= 3)
-                    return (int) (truncation & flag);
+                    return ((int) truncation & flag);
             }
             /* Complex: Shouldn't happen */
         }