Mercurial > hg > xemacs-beta

diff modules/ldap/eldap.c @ 4710:3a87551bfeb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message <870180fe0910051206s13dca5c3j6303732e33c478f5@mail.gmail.com>.
author Jerry James <james@xemacs.org>
date Mon, 05 Oct 2009 13:07:34 -0600
parents 986cd22006a9
children c12b646d84ee e0db3c197671
line wrap: on
line diff
--- a/modules/ldap/eldap.c	Mon Oct 05 11:08:59 2009 -0600
+++ b/modules/ldap/eldap.c	Mon Oct 05 13:07:34 2009 -0600
@@ -425,7 +425,7 @@
   LDAP *ld;
   LDAPMessage *e;
   BerElement *ptr;
-  Extbyte *a, *dn;
+  Extbyte *a, *dn, *bs, *filt;
   int i, rc;
   int  matches;
   struct ldap_unwind_struct unwind;
@@ -497,14 +497,10 @@
   CHECK_SYMBOL (attrsonly);
 
   /* Perform the search */
-  if (ldap_search (ld,
-                   NILP (base) ? "" :
-		   NEW_LISP_STRING_TO_EXTERNAL (base, Qnative),
-                   ldap_scope,
-                   NILP (filter) ? "" :
-		   NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative),
-                   ldap_attributes,
-                   NILP (attrsonly) ? 0 : 1)
+  bs = NILP (base) ? "" : NEW_LISP_STRING_TO_EXTERNAL (base, Qnative);
+  filt = NILP (filter) ? "" : NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative);
+  if (ldap_search (ld, bs, ldap_scope, filt, ldap_attributes,
+		   NILP (attrsonly) ? 0 : 1)
       == -1)
     {
       signal_ldap_error (ld, NULL, 0);