diff options
| author | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
| commit | 971de7fb158335fbda39525feb2d7776a26bc030 (patch) | |
| tree | 605333d85f16e35bb06baffcb66ac49f4ec0dce9 /src/dired.c | |
| parent | b8463cbfbe2c5183cf40772df2746e58b787ddeb (diff) | |
| download | emacs-971de7fb158335fbda39525feb2d7776a26bc030.tar.gz emacs-971de7fb158335fbda39525feb2d7776a26bc030.zip | |
Convert (most) functions in src to standard C.
* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/src/dired.c b/src/dired.c index c2090aeda0c..b5ee1546306 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -127,8 +127,7 @@ directory_files_internal_w32_unwind (Lisp_Object arg) | |||
| 127 | #endif | 127 | #endif |
| 128 | 128 | ||
| 129 | Lisp_Object | 129 | Lisp_Object |
| 130 | directory_files_internal_unwind (dh) | 130 | directory_files_internal_unwind (Lisp_Object dh) |
| 131 | Lisp_Object dh; | ||
| 132 | { | 131 | { |
| 133 | DIR *d = (DIR *) XSAVE_VALUE (dh)->pointer; | 132 | DIR *d = (DIR *) XSAVE_VALUE (dh)->pointer; |
| 134 | BLOCK_INPUT; | 133 | BLOCK_INPUT; |
| @@ -143,10 +142,7 @@ directory_files_internal_unwind (dh) | |||
| 143 | In the latter case, ID_FORMAT is passed to Ffile_attributes. */ | 142 | In the latter case, ID_FORMAT is passed to Ffile_attributes. */ |
| 144 | 143 | ||
| 145 | Lisp_Object | 144 | Lisp_Object |
| 146 | directory_files_internal (directory, full, match, nosort, attrs, id_format) | 145 | directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object match, Lisp_Object nosort, int attrs, Lisp_Object id_format) |
| 147 | Lisp_Object directory, full, match, nosort; | ||
| 148 | int attrs; | ||
| 149 | Lisp_Object id_format; | ||
| 150 | { | 146 | { |
| 151 | DIR *d; | 147 | DIR *d; |
| 152 | int directory_nbytes; | 148 | int directory_nbytes; |
| @@ -417,7 +413,7 @@ which see. */) | |||
| 417 | } | 413 | } |
| 418 | 414 | ||
| 419 | 415 | ||
| 420 | Lisp_Object file_name_completion (); | 416 | Lisp_Object file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate); |
| 421 | 417 | ||
| 422 | DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion, | 418 | DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion, |
| 423 | 2, 3, 0, | 419 | 2, 3, 0, |
| @@ -476,14 +472,11 @@ These are all file names in directory DIRECTORY which begin with FILE. */) | |||
| 476 | return file_name_completion (file, directory, 1, 0, Qnil); | 472 | return file_name_completion (file, directory, 1, 0, Qnil); |
| 477 | } | 473 | } |
| 478 | 474 | ||
| 479 | static int file_name_completion_stat (); | 475 | static int file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr); |
| 480 | Lisp_Object Qdefault_directory; | 476 | Lisp_Object Qdefault_directory; |
| 481 | 477 | ||
| 482 | Lisp_Object | 478 | Lisp_Object |
| 483 | file_name_completion (file, dirname, all_flag, ver_flag, predicate) | 479 | file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int ver_flag, Lisp_Object predicate) |
| 484 | Lisp_Object file, dirname; | ||
| 485 | int all_flag, ver_flag; | ||
| 486 | Lisp_Object predicate; | ||
| 487 | { | 480 | { |
| 488 | DIR *d; | 481 | DIR *d; |
| 489 | int bestmatchsize = 0; | 482 | int bestmatchsize = 0; |
| @@ -825,9 +818,7 @@ file_name_completion (file, dirname, all_flag, ver_flag, predicate) | |||
| 825 | else number of chars that match at the beginning. */ | 818 | else number of chars that match at the beginning. */ |
| 826 | 819 | ||
| 827 | static int | 820 | static int |
| 828 | scmp (s1, s2, len) | 821 | scmp (register unsigned char *s1, register unsigned char *s2, int len) |
| 829 | register unsigned char *s1, *s2; | ||
| 830 | int len; | ||
| 831 | { | 822 | { |
| 832 | register int l = len; | 823 | register int l = len; |
| 833 | 824 | ||
| @@ -848,10 +839,7 @@ scmp (s1, s2, len) | |||
| 848 | } | 839 | } |
| 849 | 840 | ||
| 850 | static int | 841 | static int |
| 851 | file_name_completion_stat (dirname, dp, st_addr) | 842 | file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr) |
| 852 | Lisp_Object dirname; | ||
| 853 | DIRENTRY *dp; | ||
| 854 | struct stat *st_addr; | ||
| 855 | { | 843 | { |
| 856 | int len = NAMLEN (dp); | 844 | int len = NAMLEN (dp); |
| 857 | int pos = SCHARS (dirname); | 845 | int pos = SCHARS (dirname); |
| @@ -893,8 +881,7 @@ file_name_completion_stat (dirname, dp, st_addr) | |||
| 893 | } | 881 | } |
| 894 | 882 | ||
| 895 | Lisp_Object | 883 | Lisp_Object |
| 896 | make_time (time) | 884 | make_time (time_t time) |
| 897 | time_t time; | ||
| 898 | { | 885 | { |
| 899 | return Fcons (make_number (time >> 16), | 886 | return Fcons (make_number (time >> 16), |
| 900 | Fcons (make_number (time & 0177777), Qnil)); | 887 | Fcons (make_number (time & 0177777), Qnil)); |
| @@ -1103,7 +1090,7 @@ Comparison is in lexicographic order and case is significant. */) | |||
| 1103 | } | 1090 | } |
| 1104 | 1091 | ||
| 1105 | void | 1092 | void |
| 1106 | syms_of_dired () | 1093 | syms_of_dired (void) |
| 1107 | { | 1094 | { |
| 1108 | Qdirectory_files = intern_c_string ("directory-files"); | 1095 | Qdirectory_files = intern_c_string ("directory-files"); |
| 1109 | Qdirectory_files_and_attributes = intern_c_string ("directory-files-and-attributes"); | 1096 | Qdirectory_files_and_attributes = intern_c_string ("directory-files-and-attributes"); |