Add comments to UTF-8 declarations.

[openldap] / libraries / libldap / cldap.c

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index dbe1abdae4e7fe022b07d2475476b720b0b99ad9..46872b47413cad3deae2cd1721d3c4dee76a334a 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -128,9 +129,9 @@ cldap_open( LDAP_CONST char *host, int port )
                }
 
                for ( i = 0; hp->h_addr_list[ i ] != 0; ++i ) {
-                   SAFEMEMCPY( (char *)&sock.sin_addr.s_addr,
+                   SAFEMEMCPY( (char *)&sock.sin_addr,
                            (char *)hp->h_addr_list[ i ],
-                           sizeof(sock.sin_addr.s_addr));
+                           sizeof(sock.sin_addr));
                    if ( add_addr( ld, (struct sockaddr *)&sock ) < 0 ) {
                        ldap_ld_free( ld, 1, NULL, NULL );
                        LDAP_FREE( host_dup );
@@ -153,8 +154,7 @@ cldap_open( LDAP_CONST char *host, int port )
        }
        LDAP_FREE( host_dup );
     } else {
-       address = INADDR_LOOPBACK;
-       sock.sin_addr.s_addr = htonl( address );
+       sock.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
        if ( add_addr( ld, (struct sockaddr *)&sock ) < 0 ) {
            ldap_ld_free( ld, 1, NULL, NULL );
            DO_RETURN( NULL );
@@ -503,8 +503,8 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 
 #ifdef LDAP_DEBUG
        if ( ldap_debug & LDAP_DEBUG_PACKETS ) {
-           fprintf( stderr, "cldap_parsemsg add message id %d type %d:\n",
-                   ldm->lm_msgid, ldm->lm_msgtype  );
+           fprintf( stderr, "cldap_parsemsg add message id %ld type %ld:\n",
+                   (long) ldm->lm_msgid, (long) ldm->lm_msgtype  );
            ber_log_dump( LDAP_DEBUG_BER, ldap_debug, ldm->lm_ber, 1 );
        }
 #endif /* LDAP_DEBUG */