diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:17:44 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:17:44 -0800 |
| commit | 42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (patch) | |
| tree | e9e37d432417ac382a36b9e6f26db38e59ca0585 /src/dired.c | |
| parent | 3de84ad9c45382c181e3383d433442f4e19ba722 (diff) | |
| download | emacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.tar.gz | |
Use SSDATA when the context wants char *.
* alloc.c, buffer.c, bytecode.c, callproc.c, dired.c:
* dispnew.c, doc.c, editfns.c, emacs.c, fileio.c, filelock.c:
* fns.c, font.c, frame.c, image.c, indent.c, keyboard.c:
* lread.c, minibuf.c, print.c, process.c, search.c, widget.c:
* xdisp.c, xfaces.c, xfns.c, xml.c, xselect.c, xterm.c:
Use SSDATA (not SDATA) when the context of the expression wants
char * (not unsigned char *).
Diffstat (limited to 'src/dired.c')
| -rw-r--r-- | src/dired.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/dired.c b/src/dired.c index 0f1b07a395d..08aa230f65f 100644 --- a/src/dired.c +++ b/src/dired.c @@ -176,7 +176,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m which might compile a new regexp until we're done with the loop! */ BLOCK_INPUT; - d = opendir (SDATA (dirfilename)); + d = opendir (SSDATA (dirfilename)); UNBLOCK_INPUT; if (d == NULL) report_file_error ("Opening directory", Fcons (directory, Qnil)); @@ -258,7 +258,7 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m QUIT; if (NILP (match) - || (0 <= re_search (bufp, SDATA (name), len, 0, len, 0))) + || (0 <= re_search (bufp, SSDATA (name), len, 0, len, 0))) wanted = 1; immediate_quit = 0; @@ -498,7 +498,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v encoded_dir = ENCODE_FILE (dirname); BLOCK_INPUT; - d = opendir (SDATA (Fdirectory_file_name (encoded_dir))); + d = opendir (SSDATA (Fdirectory_file_name (encoded_dir))); UNBLOCK_INPUT; if (!d) report_file_error ("Opening directory", Fcons (dirname, Qnil)); @@ -970,7 +970,7 @@ so last access time will always be midnight of that day. */) encoded = ENCODE_FILE (filename); UNGCPRO; - if (lstat (SDATA (encoded), &s) < 0) + if (lstat (SSDATA (encoded), &s) < 0) return Qnil; switch (s.st_mode & S_IFMT) @@ -1099,4 +1099,3 @@ It ignores directory names if they match any string in this list which ends in a slash. */); Vcompletion_ignored_extensions = Qnil; } - |