fix ambiguous use of && and || (please check :)

diff --git a/libraries/liblunicode/ucstr.c b/libraries/liblunicode/ucstr.c
index 839a0086e60d0ec5fb7dd8c55bf308cef7bafd79..f0cc6033221fdedb51faf08ce53657652c9f0abf 100644 (file)
--- a/libraries/liblunicode/ucstr.c
+++ b/libraries/liblunicode/ucstr.c
@@ -269,7 +269,7 @@ int UTF8bvnormcmp(
        struct berval *bv2,
        unsigned flags )
 {
-       int i, l1, l2, len, ulen, res;
+       int i, l1, l2, len, ulen, res = 0;
        char *s1, *s2, *done;
        unsigned long *ucs, *ucsout1, *ucsout2;
        unsigned casefold = flags & LDAP_UTF8_CASEFOLD;
@@ -310,8 +310,8 @@ int UTF8bvnormcmp(
                                if (!LDAP_UTF8_ISASCII(s1) || !LDAP_UTF8_ISASCII(s2)) {
                                        break;
                                }
-                       } else if ((len < l1) && !LDAP_UTF8_ISASCII(s1) ||
-                                  (len < l2) && !LDAP_UTF8_ISASCII(s2)) {
+                       } else if (((len < l1) && !LDAP_UTF8_ISASCII(s1)) ||
+                                  ((len < l2) && !LDAP_UTF8_ISASCII(s2))) {
                                break;
                        }
                        return res;