const-ified the code, removed Curl_ldap_done()

diff --git a/lib/ldap.c b/lib/ldap.c
index e8aec2818c2393d94f20b519cfd291148e78a87c..b84eb4d30fae127550ee89ed44a7aa8f5fddd26f 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -101,7 +101,7 @@ static void DynaClose(void)
 #endif
 }
 
-static void * DynaGetFunction(char *name)
+static void * DynaGetFunction(const char *name)
 {
   void *func = NULL;
 
@@ -117,15 +117,11 @@ static void * DynaGetFunction(char *name)
 static int WriteProc(void *param, char *text, int len)
 {
   struct UrlData *data = (struct UrlData *)param;
+  len = 0; /* prevent compiler warning */
   Curl_client_write(data, CLIENTWRITE_BODY, text, 0);
   return 0;
 }
 
-CURLcode Curl_ldap_done(struct connectdata *conn)
-{
-  return CURLE_OK;
-}
-
 /***********************************************************************
  */
 CURLcode Curl_ldap(struct connectdata *conn)
@@ -194,7 +190,7 @@ CURLcode Curl_ldap(struct connectdata *conn)
            if (ldaptext) {
              rc = ldap_entry2text(server, NULL, entryIterator, NULL,
                                   NULL, NULL, WriteProc, data,
-                                  "", 0, 0);
+                                  (char *)"", 0, 0);
              if (rc != 0) {
                failf(data, "LDAP: %s", ldap_err2string(rc));
                status = CURLE_LDAP_SEARCH_FAILED;
@@ -202,7 +198,7 @@ CURLcode Curl_ldap(struct connectdata *conn)
            } else {
              rc = ldap_entry2html(server, NULL, entryIterator, NULL,
                                   NULL, NULL, WriteProc, data,
-                                  "", 0, 0, NULL, NULL);
+                                  (char *)"", 0, 0, NULL, NULL);
              if (rc != 0) {
                failf(data, "LDAP: %s", ldap_err2string(rc));
                status = CURLE_LDAP_SEARCH_FAILED;