Mercurial > hg > xemacs-beta
comparison src/dired.c @ 5581:56144c8593a8
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 | 1f0b15040456 |
| children | 86d33ddc7fd6 |
comparison
equal
deleted
inserted
replaced
| 5580:a0e81357194e | 5581:56144c8593a8 |
|---|---|
| 505 | 505 |
| 506 if (all_flag || NILP (bestmatch)) | 506 if (all_flag || NILP (bestmatch)) |
| 507 return bestmatch; | 507 return bestmatch; |
| 508 if (matchcount == 1 && bestmatchsize == file_name_length) | 508 if (matchcount == 1 && bestmatchsize == file_name_length) |
| 509 return Qt; | 509 return Qt; |
| 510 return Fsubseq (bestmatch, Qzero, make_int (bestmatchsize)); | 510 return Fsubseq (bestmatch, Qzero, make_fixnum (bestmatchsize)); |
| 511 } | 511 } |
| 512 | 512 |
| 513 | 513 |
| 514 static Lisp_Object user_name_completion (Lisp_Object user, | 514 static Lisp_Object user_name_completion (Lisp_Object user, |
| 515 int all_flag, | 515 int all_flag, |
| 667 xNetUserEnum (NULL, 0, 0, (LPBYTE *) &bufptr, 1024, | 667 xNetUserEnum (NULL, 0, 0, (LPBYTE *) &bufptr, 1024, |
| 668 &entriesread, &totalentries, &resume_handle); | 668 &entriesread, &totalentries, &resume_handle); |
| 669 if (status_status_statui_statum_statu != NERR_Success && | 669 if (status_status_statui_statum_statu != NERR_Success && |
| 670 status_status_statui_statum_statu != ERROR_MORE_DATA) | 670 status_status_statui_statum_statu != ERROR_MORE_DATA) |
| 671 invalid_operation ("Error enumerating users", | 671 invalid_operation ("Error enumerating users", |
| 672 make_int (GetLastError ())); | 672 make_fixnum (GetLastError ())); |
| 673 for (i = 0; i < (int) entriesread; i++) | 673 for (i = 0; i < (int) entriesread; i++) |
| 674 { | 674 { |
| 675 DO_REALLOC (user_cache.user_names, user_cache.size, | 675 DO_REALLOC (user_cache.user_names, user_cache.size, |
| 676 user_cache.length + 1, struct user_name); | 676 user_cache.length + 1, struct user_name); |
| 677 TO_INTERNAL_FORMAT (C_STRING, | 677 TO_INTERNAL_FORMAT (C_STRING, |
| 769 | 769 |
| 770 if (all_flag || NILP (bestmatch)) | 770 if (all_flag || NILP (bestmatch)) |
| 771 return bestmatch; | 771 return bestmatch; |
| 772 if (matchcount == 1 && bestmatchsize == user_name_length) | 772 if (matchcount == 1 && bestmatchsize == user_name_length) |
| 773 return Qt; | 773 return Qt; |
| 774 return Fsubseq (bestmatch, Qzero, make_int (bestmatchsize)); | 774 return Fsubseq (bestmatch, Qzero, make_fixnum (bestmatchsize)); |
| 775 } | 775 } |
| 776 | 776 |
| 777 | 777 |
| 778 Lisp_Object | 778 Lisp_Object |
| 779 make_directory_hash_table (Lisp_Object path) | 779 make_directory_hash_table (Lisp_Object path) |
| 901 break; | 901 break; |
| 902 #endif | 902 #endif |
| 903 } | 903 } |
| 904 | 904 |
| 905 #ifndef HAVE_BIGNUM | 905 #ifndef HAVE_BIGNUM |
| 906 size = make_integer (NUMBER_FITS_IN_AN_EMACS_INT (s.st_size) ? | 906 size = make_integer (NUMBER_FITS_IN_A_FIXNUM (s.st_size) ? |
| 907 (EMACS_INT)s.st_size : -1); | 907 (EMACS_INT)s.st_size : -1); |
| 908 #else | 908 #else |
| 909 size = make_integer (s.st_size); | 909 size = make_integer (s.st_size); |
| 910 #endif | 910 #endif |
| 911 | 911 |
| 925 gid = (s.st_gid != getegid ()) ? Qt : Qnil; | 925 gid = (s.st_gid != getegid ()) ? Qt : Qnil; |
| 926 #endif /* BSD4_2 or BSD4_3 */ | 926 #endif /* BSD4_2 or BSD4_3 */ |
| 927 | 927 |
| 928 RETURN_UNGCPRO (listn (12, | 928 RETURN_UNGCPRO (listn (12, |
| 929 mode, | 929 mode, |
| 930 make_int (s.st_nlink), | 930 make_fixnum (s.st_nlink), |
| 931 make_int (s.st_uid), | 931 make_fixnum (s.st_uid), |
| 932 make_int (s.st_gid), | 932 make_fixnum (s.st_gid), |
| 933 make_time (s.st_atime), | 933 make_time (s.st_atime), |
| 934 make_time (s.st_mtime), | 934 make_time (s.st_mtime), |
| 935 make_time (s.st_ctime), | 935 make_time (s.st_ctime), |
| 936 size, | 936 size, |
| 937 modestring, | 937 modestring, |
| 938 gid, | 938 gid, |
| 939 make_int (s.st_ino), | 939 make_fixnum (s.st_ino), |
| 940 make_int (s.st_dev))); | 940 make_fixnum (s.st_dev))); |
| 941 } | 941 } |
| 942 | 942 |
| 943 | 943 |
| 944 /************************************************************************/ | 944 /************************************************************************/ |
| 945 /* initialization */ | 945 /* initialization */ |