diff options
| author | Paul Eggert | 2011-01-30 14:17:44 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-30 14:17:44 -0800 |
| commit | 42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (patch) | |
| tree | e9e37d432417ac382a36b9e6f26db38e59ca0585 /src/doc.c | |
| parent | 3de84ad9c45382c181e3383d433442f4e19ba722 (diff) | |
| download | emacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.tar.gz emacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.zip | |
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/doc.c')
| -rw-r--r-- | src/doc.c | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -120,8 +120,8 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition) | |||
| 120 | if (minsize < 8) | 120 | if (minsize < 8) |
| 121 | minsize = 8; | 121 | minsize = 8; |
| 122 | name = (char *) alloca (minsize + SCHARS (file) + 8); | 122 | name = (char *) alloca (minsize + SCHARS (file) + 8); |
| 123 | strcpy (name, SDATA (Vdoc_directory)); | 123 | strcpy (name, SSDATA (Vdoc_directory)); |
| 124 | strcat (name, SDATA (file)); | 124 | strcat (name, SSDATA (file)); |
| 125 | } | 125 | } |
| 126 | else | 126 | else |
| 127 | { | 127 | { |
| @@ -137,7 +137,7 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition) | |||
| 137 | /* Preparing to dump; DOC file is probably not installed. | 137 | /* Preparing to dump; DOC file is probably not installed. |
| 138 | So check in ../etc. */ | 138 | So check in ../etc. */ |
| 139 | strcpy (name, "../etc/"); | 139 | strcpy (name, "../etc/"); |
| 140 | strcat (name, SDATA (file)); | 140 | strcat (name, SSDATA (file)); |
| 141 | 141 | ||
| 142 | fd = emacs_open (name, O_RDONLY, 0); | 142 | fd = emacs_open (name, O_RDONLY, 0); |
| 143 | } | 143 | } |
| @@ -559,9 +559,9 @@ the same file name is found in the `doc-directory'. */) | |||
| 559 | CHECK_STRING (Vdoc_directory); | 559 | CHECK_STRING (Vdoc_directory); |
| 560 | name = (char *) alloca (SCHARS (filename) | 560 | name = (char *) alloca (SCHARS (filename) |
| 561 | + SCHARS (Vdoc_directory) + 1); | 561 | + SCHARS (Vdoc_directory) + 1); |
| 562 | strcpy (name, SDATA (Vdoc_directory)); | 562 | strcpy (name, SSDATA (Vdoc_directory)); |
| 563 | } | 563 | } |
| 564 | strcat (name, SDATA (filename)); /*** Add this line ***/ | 564 | strcat (name, SSDATA (filename)); /*** Add this line ***/ |
| 565 | 565 | ||
| 566 | /* Vbuild_files is nil when temacs is run, and non-nil after that. */ | 566 | /* Vbuild_files is nil when temacs is run, and non-nil after that. */ |
| 567 | if (NILP (Vbuild_files)) | 567 | if (NILP (Vbuild_files)) |