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 | 508797961304a60f7f09e84faea9dfcbbf26e1b0 (patch) | |
| tree | a7afae1806df15d8550eac9b4ca067cbd9026bad /src/editfns.c | |
| parent | 5f22dc4347ae9b12cf1fdccc2f62b3cdab47ce00 (diff) | |
| download | emacs-508797961304a60f7f09e84faea9dfcbbf26e1b0.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/editfns.c')
| -rw-r--r-- | src/editfns.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/editfns.c b/src/editfns.c index 93ae5647b04..2d8fcb6c85b 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -109,10 +109,6 @@ static Lisp_Object subst_char_in_region_unwind (Lisp_Object); static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object); static void transpose_markers (int, int, int, int, int, int, int, int); -#ifdef HAVE_INDEX -extern char *index (const char *, int); -#endif - Lisp_Object Vbuffer_access_fontify_functions; Lisp_Object Qbuffer_access_fontify_functions; Lisp_Object Vbuffer_access_fontified_property; @@ -1369,12 +1365,12 @@ name, or nil if there is no such user. */) p = (unsigned char *) USER_FULL_NAME; /* Chop off everything after the first comma. */ - q = (unsigned char *) index (p, ','); + q = (unsigned char *) strchr (p, ','); full = make_string (p, q ? q - p : strlen (p)); #ifdef AMPERSAND_FULL_NAME p = SDATA (full); - q = (unsigned char *) index (p, '&'); + q = (unsigned char *) strchr (p, '&'); /* Substitute the login name for the &, upcasing the first character. */ if (q) { @@ -3813,7 +3809,7 @@ usage: (format STRING &rest OBJECTS) */) discarded[format - format_start] = 1; format++; - while (index ("-+0# ", *format)) + while (strchr ("-+0# ", *format)) { if (*format == '-') { |