comparison src/dired.c @ 34970:947b53b0a1da

(directory_files_internal): Fix a typo in a comment. Remove an unused variable `handler'. (file_name_completion): Remove unused function-scope variable `dp'. (Ffile_attributes) <dirname, sdir>: Make declarations conditioned on BSD4_2.
author Eli Zaretskii <eliz@gnu.org>
date Tue, 02 Jan 2001 14:07:22 +0000
parents 649d6e831f61
children 45cf8bfedaf2
comparison
equal deleted inserted replaced
34969:d7e7fa35dd10 34970:947b53b0a1da
137 int attrs; 137 int attrs;
138 { 138 {
139 DIR *d; 139 DIR *d;
140 int directory_nbytes; 140 int directory_nbytes;
141 Lisp_Object list, dirfilename, encoded_directory; 141 Lisp_Object list, dirfilename, encoded_directory;
142 Lisp_Object handler;
143 struct re_pattern_buffer *bufp = NULL; 142 struct re_pattern_buffer *bufp = NULL;
144 int needsep = 0; 143 int needsep = 0;
145 int count = specpdl_ptr - specpdl; 144 int count = specpdl_ptr - specpdl;
146 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; 145 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
147 DIRENTRY *dp; 146 DIRENTRY *dp;
169 #else 168 #else
170 bufp = compile_pattern (match, 0, Qnil, 0, 1); 169 bufp = compile_pattern (match, 0, Qnil, 0, 1);
171 #endif 170 #endif
172 } 171 }
173 172
174 /* Note: ENOCDE_FILE and DECODE_FILE can GC because they can run 173 /* Note: ENCODE_FILE and DECODE_FILE can GC because they can run
175 run_pre_post_conversion_on_str which calls Lisp directly and 174 run_pre_post_conversion_on_str which calls Lisp directly and
176 indirectly. */ 175 indirectly. */
177 dirfilename = ENCODE_FILE (dirfilename); 176 dirfilename = ENCODE_FILE (dirfilename);
178 encoded_directory = ENCODE_FILE (directory); 177 encoded_directory = ENCODE_FILE (directory);
179 178
444 file_name_completion (file, dirname, all_flag, ver_flag) 443 file_name_completion (file, dirname, all_flag, ver_flag)
445 Lisp_Object file, dirname; 444 Lisp_Object file, dirname;
446 int all_flag, ver_flag; 445 int all_flag, ver_flag;
447 { 446 {
448 DIR *d; 447 DIR *d;
449 DIRENTRY *dp;
450 int bestmatchsize = 0, skip; 448 int bestmatchsize = 0, skip;
451 register int compare, matchsize; 449 register int compare, matchsize;
452 unsigned char *p1, *p2; 450 unsigned char *p1, *p2;
453 int matchcount = 0; 451 int matchcount = 0;
454 Lisp_Object bestmatch, tem, elt, name; 452 Lisp_Object bestmatch, tem, elt, name;
818 If file does not exist, returns nil.") 816 If file does not exist, returns nil.")
819 (filename) 817 (filename)
820 Lisp_Object filename; 818 Lisp_Object filename;
821 { 819 {
822 Lisp_Object values[12]; 820 Lisp_Object values[12];
823 Lisp_Object dirname;
824 Lisp_Object encoded; 821 Lisp_Object encoded;
825 struct stat s; 822 struct stat s;
823 #ifdef BSD4_2
824 Lisp_Object dirname;
826 struct stat sdir; 825 struct stat sdir;
826 #endif
827 char modes[10]; 827 char modes[10];
828 Lisp_Object handler; 828 Lisp_Object handler;
829 829
830 filename = Fexpand_file_name (filename, Qnil); 830 filename = Fexpand_file_name (filename, Qnil);
831 831