cleanup.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6815 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/directories/mod_ldap/mod_ldap.c b/src/mod/directories/mod_ldap/mod_ldap.c
index 1654bbce19897606ba9f59a03dec67bc0d02a931..320a1e924564324d448a552f2bb831d1d5cb8499 100644 (file)
--- a/src/mod/directories/mod_ldap/mod_ldap.c
+++ b/src/mod/directories/mod_ldap/mod_ldap.c
@@ -81,7 +81,6 @@ static switch_status_t mod_ldap_open(switch_directory_handle_t *dh, char *source
                return SWITCH_STATUS_FALSE;
        }
 
-
        dh->private_info = context;
 
        return SWITCH_STATUS_SUCCESS;
@@ -92,7 +91,7 @@ static switch_status_t mod_ldap_close(switch_directory_handle_t *dh)
        struct ldap_context *context;
 
        context = dh->private_info;
-       assert(context != NULL);
+       switch_assert(context != NULL);
 
        ldap_unbind_s(context->ld);
 
@@ -102,11 +101,17 @@ static switch_status_t mod_ldap_close(switch_directory_handle_t *dh)
 static switch_status_t mod_ldap_query(switch_directory_handle_t *dh, char *base, char *query)
 {
        struct ldap_context *context;
+       char **attrs = NULL;
 
        context = dh->private_info;
-       assert(context != NULL);
+       switch_assert(context != NULL);
+#if _MSC_VER >= 1500
+       /* Silence warning from incorrect code analysis signature.  attrs == NULL indicates to return all attrs */
+       /* http://msdn2.microsoft.com/en-us/library/aa908101.aspx */
+       __analysis_assume(attrs);
+#endif
 
-       if (ldap_search_s(context->ld, base, LDAP_SCOPE_SUBTREE, query, NULL, 0, &context->msg) != LDAP_SUCCESS) {
+       if (ldap_search_s(context->ld, base, LDAP_SCOPE_SUBTREE, query, attrs, 0, &context->msg) != LDAP_SUCCESS) {
                return SWITCH_STATUS_FALSE;
        }
 
@@ -122,7 +127,7 @@ static switch_status_t mod_ldap_next(switch_directory_handle_t *dh)
        struct ldap_context *context;
 
        context = dh->private_info;
-       assert(context != NULL);
+       switch_assert(context != NULL);
 
        context->vitt = 0;
 
@@ -146,7 +151,7 @@ static switch_status_t mod_ldap_next_pair(switch_directory_handle_t *dh, char **
        struct ldap_context *context;
 
        context = dh->private_info;
-       assert(context != NULL);
+       switch_assert(context != NULL);
 
        *var = *val = NULL;