rename ldap_pvt_init_utils() to ldap_int_utils_init() and provide

[openldap] / libraries / libldap / tmplout.c

diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index 16331811cdbee3039a73ec1b31d20602de5191c4..c04550bb664ba54e86dd9bee8d2d584931575216 100644 (file)
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -64,8 +64,8 @@ static int searchaction LDAP_P((
 #define OCATTRNAME             "objectClass"
 
 
-#define NONFATAL_LDAP_ERR( err )       ( err == LDAP_SUCCESS || \
-       err == LDAP_TIMELIMIT_EXCEEDED || err == LDAP_SIZELIMIT_EXCEEDED )
+#define NONFATAL_LDAP_ERR( err )       ( (err) == LDAP_SUCCESS || \
+       (err) == LDAP_TIMELIMIT_EXCEEDED || (err) == LDAP_SIZELIMIT_EXCEEDED )
 
 #define DEF_LDAP_URL_PREFIX    "ldap:///"
 
@@ -256,7 +256,7 @@ do_entry2text(
                freevals = 1;
            }
 
-               *attr = TOUPPER( *attr );
+           *attr = TOUPPER( (unsigned char) *attr );
 
            err = do_vals2text( ld, buf, vals, attr, labelwidth,
                    LDAP_SYN_CASEIGNORESTR, writeproc, writeparm, eol, 
@@ -309,14 +309,14 @@ do_entry2text(
                if ( show && LDAP_GET_SYN_TYPE( colp->ti_syntaxid )
                        == LDAP_SYN_TYPE_BOOLEAN && LDAP_IS_TMPLITEM_OPTION_SET(
                        colp, LDAP_DITEM_OPT_HIDEIFFALSE ) &&
-                       TOUPPER( vals[ 0 ][ 0 ] ) != 'T' ) {
+                       TOUPPER( (unsigned char) vals[ 0 ][ 0 ] ) != 'T' ) {
                    show = 0;
                }
 
                if ( colp->ti_syntaxid == LDAP_SYN_SEARCHACTION ) {
                    if (( opts & LDAP_DISP_OPT_DOSEARCHACTIONS ) != 0 ) {
                        if ( colp->ti_attrname == NULL || ( show &&
-                               TOUPPER( vals[ 0 ][ 0 ] ) == 'T' )) {
+                               TOUPPER( (unsigned char) vals[ 0 ][ 0 ] ) == 'T' )) {
                            err = searchaction( ld, buf, base, entry, dn, colp,
                                    labelwidth, rdncount, writeproc,
                                    writeparm, eol, urlprefix );
@@ -680,7 +680,7 @@ do_vals2text(
            p = s = outval;
            while (( s = strchr( s, '$' )) != NULL ) {
                *s++ = '\0';
-               while ( isspace( *s )) {
+               while ( isspace( (unsigned char) *s )) {
                    ++s;
                }
                if ( html ) {
@@ -696,7 +696,7 @@ do_vals2text(
            break;
 
        case LDAP_SYN_BOOLEAN:
-           outval = TOUPPER( outval[ 0 ] ) == 'T' ? "TRUE" : "FALSE";
+           outval = TOUPPER((unsigned char) outval[0]) == 'T' ? "TRUE" : "FALSE";
            ++writeoutval;
            break;
 
@@ -709,13 +709,13 @@ do_vals2text(
        case LDAP_SYN_LABELEDURL:
            if ( !notascii && ( p = strchr( outval, '$' )) != NULL ) {
                *p++ = '\0';
-               while ( isspace( *p )) {
+               while ( isspace( (unsigned char) *p )) {
                    ++p;
                }
                s = outval;
            } else if ( !notascii && ( s = strchr( outval, ' ' )) != NULL ) {
                *s++ = '\0';
-               while ( isspace( *s )) {
+               while ( isspace( (unsigned char) *s )) {
                    ++s;
                }
                p = outval;
@@ -848,10 +848,10 @@ output_dn( char *buf, char *dn, int width, int rdncount,
 
 
 
-#define HREF_CHAR_ACCEPTABLE( c )      (( c >= '-' && c <= '9' ) ||    \
-                                        ( c >= '@' && c <= 'Z' ) ||    \
-                                        ( c == '_' ) ||                \
-                                        ( c >= 'a' && c <= 'z' ))
+#define HREF_CHAR_ACCEPTABLE( c )      (( (c) >= '-' && (c) <= '9' ) || \
+                                        ( (c) >= '@' && (c) <= 'Z' ) || \
+                                        ( (c) == '_' )               || \
+                                        ( (c) >= 'a' && (c) <= 'z' ))
 
 static void
 strcat_escaped( char *s1, char *s2 )
@@ -874,7 +874,7 @@ strcat_escaped( char *s1, char *s2 )
 }
 
 
-#define GET2BYTENUM( p )       (( *p - '0' ) * 10 + ( *(p+1) - '0' ))
+#define GET2BYTENUM( p )       (( *(p) - '0' ) * 10 + ( *((p)+1) - '0' ))
 
 static char *
 time2text( char *ldtimestr, int dateonly )
@@ -889,7 +889,7 @@ time2text( char *ldtimestr, int dateonly )
                return( fmterr );
        }
 
-    for ( ndigits=0; isdigit(ldtimestr[ndigits]); ndigits++) { 
+    for ( ndigits=0; isdigit((unsigned char) ldtimestr[ndigits]); ndigits++) {
                ; /* EMPTY */
     }
 
@@ -938,7 +938,7 @@ time2text( char *ldtimestr, int dateonly )
        This routine was supplied by Mike Accetta at CMU many years ago.
  */
 
-static int     dmsize[] = {
+static const int dmsize[] = {
     31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };