Mercurial > hg > xemacs-beta

comparison modules/ldap/eldap.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents 308d34e9f07d
children
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
232 EXTERNAL_PROPERTY_LIST_LOOP_3 (keyword, value, plist) 232 EXTERNAL_PROPERTY_LIST_LOOP_3 (keyword, value, plist)
233 { 233 {
234 /* TCP Port */ 234 /* TCP Port */
235 if (EQ (keyword, Qport)) 235 if (EQ (keyword, Qport))
236 { 236 {
237 CHECK_INT (value); 237 CHECK_FIXNUM (value);
238 ldap_port = XINT (value); 238 ldap_port = XFIXNUM (value);
239 } 239 }
240 /* Authentication method */ 240 /* Authentication method */
241 if (EQ (keyword, Qauth)) 241 if (EQ (keyword, Qauth))
242 { 242 {
243 if (EQ (value, Qsimple)) 243 if (EQ (value, Qsimple))
280 invalid_constant ("Invalid deref value", value); 280 invalid_constant ("Invalid deref value", value);
281 } 281 }
282 /* Timelimit */ 282 /* Timelimit */
283 else if (EQ (keyword, Qtimelimit)) 283 else if (EQ (keyword, Qtimelimit))
284 { 284 {
285 CHECK_INT (value); 285 CHECK_FIXNUM (value);
286 ldap_timelimit = XINT (value); 286 ldap_timelimit = XFIXNUM (value);
287 } 287 }
288 /* Sizelimit */ 288 /* Sizelimit */
289 else if (EQ (keyword, Qsizelimit)) 289 else if (EQ (keyword, Qsizelimit))
290 { 290 {
291 CHECK_INT (value); 291 CHECK_FIXNUM (value);
292 ldap_sizelimit = XINT (value); 292 ldap_sizelimit = XFIXNUM (value);
293 } 293 }
294 } 294 }
295 } 295 }
296 296
297 if (ldap_port == 0) 297 if (ldap_port == 0)
471 471
472 /* Attributes to search */ 472 /* Attributes to search */
473 if (!NILP (attrs)) 473 if (!NILP (attrs))
474 { 474 {
475 CHECK_CONS (attrs); 475 CHECK_CONS (attrs);
476 ldap_attributes = alloca_array (char *, 1 + XINT (Flength (attrs))); 476 ldap_attributes = alloca_array (char *, 1 + XFIXNUM (Flength (attrs)));
477 477
478 i = 0; 478 i = 0;
479 { 479 {
480 EXTERNAL_LIST_LOOP_2 (current, attrs) 480 EXTERNAL_LIST_LOOP_2 (current, attrs)
481 { 481 {
626 CHECK_CONS (entry); 626 CHECK_CONS (entry);
627 if (NILP (entry)) 627 if (NILP (entry))
628 invalid_operation ("Cannot add void entry", entry); 628 invalid_operation ("Cannot add void entry", entry);
629 629
630 /* Build the ldap_mods array */ 630 /* Build the ldap_mods array */
631 len = (Elemcount) XINT (Flength (entry)); 631 len = (Elemcount) XFIXNUM (Flength (entry));
632 ldap_mods = alloca_array (LDAPMod, len); 632 ldap_mods = alloca_array (LDAPMod, len);
633 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len); 633 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len);
634 i = 0; 634 i = 0;
635 635
636 { 636 {
643 LISP_STRING_TO_EXTERNAL (XCAR (current), Qnative); 643 LISP_STRING_TO_EXTERNAL (XCAR (current), Qnative);
644 ldap_mods[i].mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES; 644 ldap_mods[i].mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES;
645 values = XCDR (current); 645 values = XCDR (current);
646 if (CONSP (values)) 646 if (CONSP (values))
647 { 647 {
648 len = (Elemcount) XINT (Flength (values)); 648 len = (Elemcount) XFIXNUM (Flength (values));
649 bervals = alloca_array (struct berval, len); 649 bervals = alloca_array (struct berval, len);
650 ldap_mods[i].mod_vals.modv_bvals = 650 ldap_mods[i].mod_vals.modv_bvals =
651 alloca_array (struct berval *, 1 + len); 651 alloca_array (struct berval *, 1 + len);
652 j = 0; 652 j = 0;
653 { 653 {
722 CHECK_CONS (mods); 722 CHECK_CONS (mods);
723 if (NILP (mods)) 723 if (NILP (mods))
724 return Qnil; 724 return Qnil;
725 725
726 /* Build the ldap_mods array */ 726 /* Build the ldap_mods array */
727 len = (Elemcount) XINT (Flength (mods)); 727 len = (Elemcount) XFIXNUM (Flength (mods));
728 ldap_mods = alloca_array (LDAPMod, len); 728 ldap_mods = alloca_array (LDAPMod, len);
729 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len); 729 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len);
730 i = 0; 730 i = 0;
731 731
732 GCPRO1 (values); 732 GCPRO1 (values);
749 current = XCDR (current); 749 current = XCDR (current);
750 CHECK_STRING (XCAR (current)); 750 CHECK_STRING (XCAR (current));
751 ldap_mods[i].mod_type = 751 ldap_mods[i].mod_type =
752 LISP_STRING_TO_EXTERNAL (XCAR (current), Qnative); 752 LISP_STRING_TO_EXTERNAL (XCAR (current), Qnative);
753 values = XCDR (current); 753 values = XCDR (current);
754 len = (Elemcount) XINT (Flength (values)); 754 len = (Elemcount) XFIXNUM (Flength (values));
755 bervals = alloca_array (struct berval, len); 755 bervals = alloca_array (struct berval, len);
756 ldap_mods[i].mod_vals.modv_bvals = 756 ldap_mods[i].mod_vals.modv_bvals =
757 alloca_array (struct berval *, 1 + len); 757 alloca_array (struct berval *, 1 + len);
758 j = 0; 758 j = 0;
759 { 759 {