Commit 5e92b1ca authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(ENCODE_FILE, DECODE_FILE, ENCODE_SYSTEM, DECODE_SYSTEM):

Don't use XFASTINT blindly.
parent 8fe48a6f
/* Header for coding system handler. /* Header for coding system handler.
Copyright (C) 2004 Free Software Foundation, Inc.
Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
Licensed to the Free Software Foundation. Licensed to the Free Software Foundation.
...@@ -572,10 +573,10 @@ struct coding_system ...@@ -572,10 +573,10 @@ struct coding_system
for file names, if any. */ for file names, if any. */
#define ENCODE_FILE(name) \ #define ENCODE_FILE(name) \
(! NILP (Vfile_name_coding_system) \ (! NILP (Vfile_name_coding_system) \
&& XFASTINT (Vfile_name_coding_system) != 0 \ && !EQ (Vfile_name_coding_system, make_number (0)) \
? code_convert_string_norecord (name, Vfile_name_coding_system, 1) \ ? code_convert_string_norecord (name, Vfile_name_coding_system, 1) \
: (! NILP (Vdefault_file_name_coding_system) \ : (! NILP (Vdefault_file_name_coding_system) \
&& XFASTINT (Vdefault_file_name_coding_system) != 0 \ && !EQ (Vdefault_file_name_coding_system, make_number (0)) \
? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 1) \ ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 1) \
: name)) : name))
...@@ -583,10 +584,10 @@ struct coding_system ...@@ -583,10 +584,10 @@ struct coding_system
for file names, if any. */ for file names, if any. */
#define DECODE_FILE(name) \ #define DECODE_FILE(name) \
(! NILP (Vfile_name_coding_system) \ (! NILP (Vfile_name_coding_system) \
&& XFASTINT (Vfile_name_coding_system) != 0 \ && !EQ (Vfile_name_coding_system, make_number (0)) \
? code_convert_string_norecord (name, Vfile_name_coding_system, 0) \ ? code_convert_string_norecord (name, Vfile_name_coding_system, 0) \
: (! NILP (Vdefault_file_name_coding_system) \ : (! NILP (Vdefault_file_name_coding_system) \
&& XFASTINT (Vdefault_file_name_coding_system) != 0 \ && !EQ (Vdefault_file_name_coding_system, make_number (0)) \
? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \ ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \
: name)) : name))
...@@ -595,7 +596,7 @@ struct coding_system ...@@ -595,7 +596,7 @@ struct coding_system
for w32 system functions, if any. */ for w32 system functions, if any. */
#define ENCODE_SYSTEM(str) \ #define ENCODE_SYSTEM(str) \
(! NILP (Vlocale_coding_system) \ (! NILP (Vlocale_coding_system) \
&& XFASTINT (Vlocale_coding_system) != 0 \ && !EQ (Vlocale_coding_system, make_number (0)) \
? code_convert_string_norecord (str, Vlocale_coding_system, 1) \ ? code_convert_string_norecord (str, Vlocale_coding_system, 1) \
: str) : str)
...@@ -603,7 +604,7 @@ struct coding_system ...@@ -603,7 +604,7 @@ struct coding_system
for w32 system functions, if any. */ for w32 system functions, if any. */
#define DECODE_SYSTEM(name) \ #define DECODE_SYSTEM(name) \
(! NILP (Vlocale_coding_system) \ (! NILP (Vlocale_coding_system) \
&& XFASTINT (Vlocale_coding_system) != 0 \ && !EQ (Vlocale_coding_system, make_number (0)) \
? code_convert_string_norecord (str, Vlocale_coding_system, 0) \ ? code_convert_string_norecord (str, Vlocale_coding_system, 0) \
: str) : str)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment