Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
4709:db7068430402 4710:3a87551bfeb5
423 423
424 /* Vars for query */ 424 /* Vars for query */
425 LDAP *ld; 425 LDAP *ld;
426 LDAPMessage *e; 426 LDAPMessage *e;
427 BerElement *ptr; 427 BerElement *ptr;
428 Extbyte *a, *dn; 428 Extbyte *a, *dn, *bs, *filt;
429 int i, rc; 429 int i, rc;
430 int matches; 430 int matches;
431 struct ldap_unwind_struct unwind; 431 struct ldap_unwind_struct unwind;
432 432
433 int ldap_scope = LDAP_SCOPE_SUBTREE; 433 int ldap_scope = LDAP_SCOPE_SUBTREE;
495 495
496 /* Attributes only ? */ 496 /* Attributes only ? */
497 CHECK_SYMBOL (attrsonly); 497 CHECK_SYMBOL (attrsonly);
498 498
499 /* Perform the search */ 499 /* Perform the search */
500 if (ldap_search (ld, 500 bs = NILP (base) ? "" : NEW_LISP_STRING_TO_EXTERNAL (base, Qnative);
501 NILP (base) ? "" : 501 filt = NILP (filter) ? "" : NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative);
502 NEW_LISP_STRING_TO_EXTERNAL (base, Qnative), 502 if (ldap_search (ld, bs, ldap_scope, filt, ldap_attributes,
503 ldap_scope, 503 NILP (attrsonly) ? 0 : 1)
504 NILP (filter) ? "" :
505 NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative),
506 ldap_attributes,
507 NILP (attrsonly) ? 0 : 1)
508 == -1) 504 == -1)
509 { 505 {
510 signal_ldap_error (ld, NULL, 0); 506 signal_ldap_error (ld, NULL, 0);
511 } 507 }
512 508