diff options
| author | Stefan Monnier | 2019-03-21 23:55:28 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2019-03-21 23:55:28 -0400 |
| commit | 76fea1eba1332440eab2e3daecce053daccd3782 (patch) | |
| tree | 944ea8279b8a52cb715fe3493d909bc581776430 /src/w32proc.c | |
| parent | 57a60db2b88dfa5dea41a3a05b736cd7cd17a953 (diff) | |
| download | emacs-76fea1eba1332440eab2e3daecce053daccd3782.tar.gz emacs-76fea1eba1332440eab2e3daecce053daccd3782.zip | |
Fix misuses of NULL when talking about the NUL character
* lisp/subr.el (inhibit-null-byte-detection): Make it an obsolete alias.
* src/coding.c (setup_coding_system): Use new name.
(detect_coding): Rename null_byte_found => nul_byte_found.
(detect_coding_system): Use new name.
Rename null_byte_found => nul_byte_found.
(Fdefine_coding_system_internal): Use new name.
(syms_of_coding): Rename inhibit-null-byte-detection to
inhibit-nul-byte-detection.
* src/w16select.c (get_clipboard_data): null_char => nul_char.
* src/json.c (check_string_without_embedded_nuls): Rename from
check_string_without_embedded_nulls.
(Fjson_parse_string): Adjust accordingly.
* src/coding.h (enum define_coding_undecided_arg_index)
(enum coding_attr_index): ...null_byte... => ...nul_byte....
* lisp/info.el (info-insert-file-contents, Info-insert-dir):
* lisp/international/mule.el (define-coding-system):
* lisp/vc/vc-git.el (vc-git--call):
* doc/lispref/nonascii.texi (Lisp and Coding Systems): Use the new name.
Diffstat (limited to 'src/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index ab0bf0fff08..8e878e6ef3e 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -2002,9 +2002,9 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) | |||
| 2002 | } | 2002 | } |
| 2003 | 2003 | ||
| 2004 | /* we have to do some conjuring here to put argv and envp into the | 2004 | /* we have to do some conjuring here to put argv and envp into the |
| 2005 | form CreateProcess wants... argv needs to be a space separated/null | 2005 | form CreateProcess wants... argv needs to be a space separated/NUL |
| 2006 | terminated list of parameters, and envp is a null | 2006 | terminated list of parameters, and envp is a NUL |
| 2007 | separated/double-null terminated list of parameters. | 2007 | separated/double-NUL terminated list of parameters. |
| 2008 | 2008 | ||
| 2009 | Additionally, zero-length args and args containing whitespace or | 2009 | Additionally, zero-length args and args containing whitespace or |
| 2010 | quote chars need to be wrapped in double quotes - for this to work, | 2010 | quote chars need to be wrapped in double quotes - for this to work, |
| @@ -3393,10 +3393,10 @@ If LCID (a 16-bit number) is not a valid locale, the result is nil. */) | |||
| 3393 | got_full = GetLocaleInfo (XFIXNUM (lcid), | 3393 | got_full = GetLocaleInfo (XFIXNUM (lcid), |
| 3394 | XFIXNUM (longform), | 3394 | XFIXNUM (longform), |
| 3395 | full_name, sizeof (full_name)); | 3395 | full_name, sizeof (full_name)); |
| 3396 | /* GetLocaleInfo's return value includes the terminating null | 3396 | /* GetLocaleInfo's return value includes the terminating NUL |
| 3397 | character, when the returned information is a string, whereas | 3397 | character, when the returned information is a string, whereas |
| 3398 | make_unibyte_string needs the string length without the | 3398 | make_unibyte_string needs the string length without the |
| 3399 | terminating null. */ | 3399 | terminating NUL. */ |
| 3400 | if (got_full) | 3400 | if (got_full) |
| 3401 | return make_unibyte_string (full_name, got_full - 1); | 3401 | return make_unibyte_string (full_name, got_full - 1); |
| 3402 | } | 3402 | } |