diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2010-07-11 12:31:10 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2010-07-11 12:31:10 +0200 |
| commit | 8966b7575b1adf62101df4f2ba8ce7f59f893397 (patch) | |
| tree | edf79c21229574aa60525071acbfbd50aac9ff4b /src/doc.c | |
| parent | cf237e277f6b033fd8d47ecdc466722c73de5d96 (diff) | |
| download | emacs-8966b7575b1adf62101df4f2ba8ce7f59f893397.tar.gz | |
Use strchr, strrchr instead of index, rindex
* callint.c (Fcall_interactively): Use strchr, strrchr instead of
index, rindex.
* doc.c (get_doc_string, Fsnarf_documentation): Likewise.
* editfns.c (Fuser_full_name, Fformat): Likewise.
* emacs.c (argmatch, sort_args, decode_env_path): Likewise.
* fileio.c (Ffile_symlink_p): Likewise.
* filelock.c (current_lock_owner): Likewise.
* font.c (font_parse_name, font_parse_family_registry): Likewise.
* fontset.c (fontset_pattern_regexp): Likewise.
* lread.c (read1): Likewise.
* sysdep.c (init_system_name): Likewise.
* xfns.c (select_visual): Likewise.
* s/hpux10-20.h (index, rindex): Don't define.
* s/ms-w32.h (index): Likewise.
* s/usg5-4.h: Likewise.
* sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit.
(HAVE_STRCHR, HAVE_STRRCHR): Edit to 1.
* emacsclient.c (set_local_socket): Use strchr, strrchr instead of
index, rindex.
* movemail.c (mail_spool_name, popmail): Likewise.
* pop.c (pop_list): Likewise.
* CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
* configure.in: Don't check for index and rindex, check for strchr
and strrchr. Define strchr and strrchr as index and rindex,
resp., in src/config.h if not available.
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/doc.c b/src/doc.c index a8f6217c4ce..fc3cbc1c215 100644 --- a/src/doc.c +++ b/src/doc.c @@ -45,10 +45,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "keymap.h" #include "buildobj.h" -#ifdef HAVE_INDEX -extern char *index (const char *, int); -#endif - Lisp_Object Vdoc_file_name; Lisp_Object Qfunction_documentation; @@ -218,9 +214,9 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition) if (!nread) break; if (p == get_doc_string_buffer) - p1 = (char *) index (p + offset, '\037'); + p1 = strchr (p + offset, '\037'); else - p1 = (char *) index (p, '\037'); + p1 = strchr (p, '\037'); if (p1) { *p1 = 0; @@ -633,7 +629,7 @@ the same file name is found in the `doc-directory'. */) /* p points to ^_Ffunctionname\n or ^_Vvarname\n. */ if (p != end) { - end = (char *) index (p, '\n'); + end = strchr (p, '\n'); /* See if this is a file name, and if it is a file in build-files. */ if (p[1] == 'S' && end - p > 4 && end[-2] == '.' |