minor cleanup

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 9995f158bd006daee5a7ab5e6655baa72dbc90b8..c8a7ba5ca977f8e15b4e9bca2ab2a436f400ee77 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -95,20 +95,20 @@
 LDAP_BEGIN_DECL
 
 #define LDAP_URL_PREFIX         "ldap://"
-#define LDAP_URL_PREFIX_LEN     (sizeof(LDAP_URL_PREFIX)-1)
-#define LDAPS_URL_PREFIX               "ldaps://"
-#define LDAPS_URL_PREFIX_LEN   (sizeof(LDAPS_URL_PREFIX)-1)
+#define LDAP_URL_PREFIX_LEN     STRLENOF(LDAP_URL_PREFIX)
+#define LDAPS_URL_PREFIX       "ldaps://"
+#define LDAPS_URL_PREFIX_LEN   STRLENOF(LDAPS_URL_PREFIX)
 #define LDAPI_URL_PREFIX       "ldapi://"
-#define LDAPI_URL_PREFIX_LEN   (sizeof(LDAPI_URL_PREFIX)-1)
+#define LDAPI_URL_PREFIX_LEN   STRLENOF(LDAPI_URL_PREFIX)
 #ifdef LDAP_CONNECTIONLESS
 #define LDAPC_URL_PREFIX       "cldap://"
-#define LDAPC_URL_PREFIX_LEN   (sizeof(LDAPC_URL_PREFIX)-1)
+#define LDAPC_URL_PREFIX_LEN   STRLENOF(LDAPC_URL_PREFIX)
 #endif
-#define LDAP_URL_URLCOLON              "URL:"
-#define LDAP_URL_URLCOLON_LEN  (sizeof(LDAP_URL_URLCOLON)-1)
+#define LDAP_URL_URLCOLON      "URL:"
+#define LDAP_URL_URLCOLON_LEN  STRLENOF(LDAP_URL_URLCOLON)
 
 #define LDAP_REF_STR           "Referral:\n"
-#define LDAP_REF_STR_LEN       (sizeof(LDAP_REF_STR)-1)
+#define LDAP_REF_STR_LEN       STRLENOF(LDAP_REF_STR)
 #define LDAP_LDAP_REF_STR      LDAP_URL_PREFIX
 #define LDAP_LDAP_REF_STR_LEN  LDAP_URL_PREFIX_LEN