diff options
| author | Paul Eggert | 2016-06-11 23:48:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-06-11 23:49:00 -0700 |
| commit | 5932ffcd028af9fc70c9f8e731f2776a9753d81d (patch) | |
| tree | 4d9ab8f89fdc526146e5571f028147afde568e3d /src/coding.c | |
| parent | eacdc9eb6c89346fb72535632a1c65f6483b639f (diff) | |
| download | emacs-5932ffcd028af9fc70c9f8e731f2776a9753d81d.tar.gz emacs-5932ffcd028af9fc70c9f8e731f2776a9753d81d.zip | |
emacs_strerror cleanups
* src/buffer.c, src/emacs.c, src/lread.c: Don’t include coding.h;
no longer needed, now that emacs_strerror is declared by lisp.h.
* src/coding.c (emacs_strerror): Remove; moved to emacs.c.
* src/coding.h (emacs_strerror) [emacs]: Remove decl; moved
to lisp.h.
* src/emacs.c (emacs_strerror): Move here from coding.c. Do not
convert result string; this is now the caller’s responsibility,
as some need conversion and others don’t.
* src/fileio.c (report_file_errno, report_file_notify_error):
Use emacs_strerror rather than rolling it ourselves.
* src/lisp.h (emacs_strerror): Move decl here from coding.h.
* src/lread.c (dir_warning): Just call emacs_strerror rather than
both strerror and emacs_strerror. Convert its result from
locale-coding-system, since it no longer does that conversion.
* src/sound.c (sound_perror):
* src/sysdep.c (emacs_perror, str_collate):
Use emacs_strerror, not strerror.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/coding.c b/src/coding.c index 3f7d11151d4..804b628d3be 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -11303,24 +11303,4 @@ internal character representation. */); | |||
| 11303 | #endif | 11303 | #endif |
| 11304 | staticpro (&system_eol_type); | 11304 | staticpro (&system_eol_type); |
| 11305 | } | 11305 | } |
| 11306 | |||
| 11307 | char * | ||
| 11308 | emacs_strerror (int error_number) | ||
| 11309 | { | ||
| 11310 | char *str; | ||
| 11311 | |||
| 11312 | synchronize_system_messages_locale (); | ||
| 11313 | str = strerror (error_number); | ||
| 11314 | |||
| 11315 | if (! NILP (Vlocale_coding_system)) | ||
| 11316 | { | ||
| 11317 | Lisp_Object dec = code_convert_string_norecord (build_string (str), | ||
| 11318 | Vlocale_coding_system, | ||
| 11319 | 0); | ||
| 11320 | str = SSDATA (dec); | ||
| 11321 | } | ||
| 11322 | |||
| 11323 | return str; | ||
| 11324 | } | ||
| 11325 | |||
| 11326 | #endif /* emacs */ | 11306 | #endif /* emacs */ |