From 46767b31f38d6b9a1964319c5473c948dbb10c1d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 19 Jan 2010 14:38:12 +0100 Subject: [PATCH] RPN log: change some types to Odr_int --- src/logrpn.c | 4 ++-- src/rpn2cql.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/logrpn.c b/src/logrpn.c index cd8de78..06c675e 100644 --- a/src/logrpn.c +++ b/src/logrpn.c @@ -15,7 +15,7 @@ #include #include -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 --- 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 */ } -- 1.7.10.4