carbon2-commit: function renamings to track names of char typedefs
Ben Wing
ben at xemacs.org
Sun Feb 7 12:40:34 EST 2010
changeset: 5001:304aebb79cd3
user: Ben Wing <ben at xemacs.org>
date: Wed Jan 27 00:35:36 2010 -0600
files: man/ChangeLog man/emodules.texi man/internals/internals.texi modules/ChangeLog modules/canna/canna_api.c modules/ldap/eldap.c modules/postgresql/postgresql.c src/.gdbinit.in.in src/ChangeLog src/README src/abbrev.c src/alloc.c src/buffer.c src/console-tty.c src/console-x.c src/database.c src/device-gtk.c src/device-msw.c src/device-x.c src/dialog-x.c src/doc.c src/editfns.c src/emacs.c src/emodules.c src/event-Xt.c src/event-gtk.c src/event-msw.c src/faces.c src/file-coding.c src/fileio.c src/filelock.c src/floatfns.c src/font-mgr.c src/frame-msw.c src/frame-x.c src/glade.c src/glyphs-eimage.c src/glyphs-gtk.c src/glyphs-x.c src/glyphs.c src/gpmevent.c src/gtk-glue.c src/gtk-xemacs.c src/hpplay.c src/insdel.c src/insdel.h src/intl.c src/keymap.c src/lisp.h src/lread.c src/mule-charset.c src/nt.c src/objects-gtk.c src/objects-msw.c src/objects-tty.c src/objects-x.c src/print.c src/process-nt.c src/process-unix.c src/process.c src/redisplay-tty.c src/search.c src/!
select-common.h src/select-gtk.c src/select-msw.c src/select-x.c src/symbols.c src/sysdep.c src/sysdll.c src/syswindows.h src/tests.c src/text.c src/text.h src/tooltalk.c src/ui-byhand.c src/ui-gtk.c src/unexaix.c src/unexec.c src/unicode.c src/win32.c src/xemacs.def.in.in
description:
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben at xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben at xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben at xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
diff -r 19a72041c5ed -r 304aebb79cd3 man/ChangeLog
--- a/man/ChangeLog Tue Jan 26 23:22:30 2010 -0600
+++ b/man/ChangeLog Wed Jan 27 00:35:36 2010 -0600
@@ -1,3 +1,25 @@
+2010-01-27 Ben Wing <ben at xemacs.org>
+
+ * internals/internals.texi (lrecords):
+ * internals/internals.texi (The DFC API):
+ * internals/internals.texi (Conversion to and from External Data):
+ * internals/internals.texi (Mule-izing Code):
+ * internals/internals.texi (Pervasive changes throughout XEmacs sources):
+ * internals/internals.texi (Ben's README):
+ * internals/internals.texi (Future Work -- Localized Text/Messages):
+ * emodules.texi (Defining Variables):
+ Rename:
+
+ write_c_string -> write_cistring
+ build_intstring -> build_istring
+ build_string -> build_cistring
+ build_ext_string -> build_extstring
+ make_ext_string -> make_extstring
+ buffer_insert_c_string -> buffer_insert_ascstring
+ intern_int -> intern_istring
+
+ See comment in src/ChangeLog about this.
+
2010-01-06 Jerry James <james at xemacs.org>
* internals/internals.texi (Debugging and Testing): Document
diff -r 19a72041c5ed -r 304aebb79cd3 man/emodules.texi
--- a/man/emodules.texi Tue Jan 26 23:22:30 2010 -0600
+++ b/man/emodules.texi Wed Jan 27 00:35:36 2010 -0600
@@ -1058,7 +1058,7 @@
*/);
sample_boolean = 0;
- Vsample_string = build_string("My string");
+ Vsample_string = build_ascstring ("My string");
@}
@end cartouche
@end example
diff -r 19a72041c5ed -r 304aebb79cd3 man/internals/internals.texi
--- a/man/internals/internals.texi Tue Jan 26 23:22:30 2010 -0600
+++ b/man/internals/internals.texi Wed Jan 27 00:35:36 2010 -0600
@@ -8643,7 +8643,7 @@
Sub-objects are printed using @code{print_internal()}, which takes
exactly the same arguments as are passed to the print method.
-Literal C strings should be printed using @code{write_c_string()},
+Literal C strings should be printed using @code{write_cistring()},
or @code{write_string_1()} for non-null-terminated strings.
Functions that do not have a readable representation should check the
@@ -11802,7 +11802,7 @@
of conversions involving raw data and/or Lisp strings, especially when
the output is an @code{alloca()}ed string. (When the destination is a
Lisp_String, there are other functions that should be used instead --
- at code{build_ext_string()} and @code{make_ext_string()}, for example.) The convenience
+ at code{build_extstring()} and @code{make_extstring()}, for example.) The convenience
macros are of two types -- the older kind that store the result into a
specified variable, and the newer kind that return the result. The newer
kind of macros don't exist when the output is sized data, because that
@@ -12864,7 +12864,7 @@
many types of conversions involving raw data and/or Lisp strings,
especially when the output is an @code{alloca()}ed string. (When the
destination is a Lisp string, there are other functions that should be
-used instead -- @code{build_ext_string()} and @code{make_ext_string()},
+used instead -- @code{build_extstring()} and @code{make_extstring()},
for example.) The convenience macros are of two types -- the older kind
that store the result into a specified variable, and the newer kind that
return the result. The newer kind of macros don't exist when the output
@@ -13025,13 +13025,13 @@
@item
Check all uses of @code{XSTRING_DATA}.
@item
-Check all uses of @code{build_string} and @code{make_string}.
+Check all uses of @code{build_cistring} and @code{make_string}.
@item
Check all uses of @code{tolower} and @code{toupper}.
@item
Check object print methods.
@item
-Check for use of functions such as @code{write_c_string},
+Check for use of functions such as @code{write_cistring},
@code{write_fmt_string}, @code{stderr_out}, @code{stdout_out}.
@item
Check all occurrences of @code{char} and correct to one of the other
@@ -14349,15 +14349,15 @@
strings, which is quite often.
@item
-new fun @code{build_intstring()} takes an @code{Intbyte *}. also new
-funs @code{build_msg_intstring} (like @code{build_intstring()}) and
- at code{build_msg_string} (like @code{build_string()}) to do a
+new fun @code{build_istring()} takes an @code{Intbyte *}. also new
+funs @code{build_msg_intstring} (like @code{build_istring()}) and
+ at code{build_msg_string} (like @code{build_cistring()}) to do a
@code{GETTEXT()} before building the string. (elimination of old
@code{build_translated_string()}, replaced by
@code{build_msg_string()}).
@item
-function @code{intern_int()} for @code{Intbyte *} arguments, like
+function @code{intern_istring()} for @code{Intbyte *} arguments, like
@code{intern()}.
@item
@@ -15343,10 +15343,10 @@
menu item to revert to most recent auto save.
@item
-consider renaming @code{build_string} -> @code{build_intstring} and
- at code{build_c_string} to @code{build_string}. (consistent with
+consider renaming @code{build_cistring} -> @code{build_istring} and
+ at code{build_c_string} to @code{build_cistring}. (consistent with
@code{build_msg_string} et al; many more @code{build_c_string} than
- at code{build_string})
+ at code{build_cistring})
@end itemize
@heading oct 20, 2001
@@ -25689,7 +25689,7 @@
signal_simple_error_2 ("string" ... )
build_translated_string ("string")
- #### add this and use it instead of @code{build_string()} in some places.
+ #### add this and use it instead of @code{build_cistring()} in some places.
yes_or_no_p ("string" ... )
#### add this instead of funcalling Qyes_or_no_p directly.
diff -r 19a72041c5ed -r 304aebb79cd3 modules/ChangeLog
--- a/modules/ChangeLog Tue Jan 26 23:22:30 2010 -0600
+++ b/modules/ChangeLog Wed Jan 27 00:35:36 2010 -0600
@@ -1,3 +1,37 @@
+2010-01-27 Ben Wing <ben at xemacs.org>
+
+ * postgresql/postgresql.c (print_pgconn):
+ * postgresql/postgresql.c (print_pgresult):
+ * postgresql/postgresql.c (Fpq_conn_defaults):
+ * postgresql/postgresql.c (Fpq_pgconn):
+ * postgresql/postgresql.c (Fpq_res_status):
+ * postgresql/postgresql.c (Fpq_result_error_message):
+ * postgresql/postgresql.c (Fpq_fname):
+ * postgresql/postgresql.c (Fpq_get_value):
+ * postgresql/postgresql.c (Fpq_cmd_status):
+ * postgresql/postgresql.c (Fpq_cmd_tuples):
+ * postgresql/postgresql.c (Fpq_notifies):
+ * postgresql/postgresql.c (Fpq_get_line):
+ * postgresql/postgresql.c (Fpq_get_line_async):
+ * postgresql/postgresql.c (FROB):
+ * postgresql/postgresql.c (init_postgresql_from_environment):
+ * ldap/eldap.c:
+ * ldap/eldap.c (Fldap_open):
+ * ldap/eldap.c (Fldap_search_basic):
+ * canna/canna_api.c:
+ * canna/canna_api.c (make_euc_string):
+ Rename:
+
+ write_c_string -> write_cistring
+ build_intstring -> build_istring
+ build_string -> build_cistring
+ build_ext_string -> build_extstring
+ make_ext_string -> make_extstring
+ buffer_insert_c_string -> buffer_insert_ascstring
+ intern_int -> intern_istring
+
+ See comment in src/ChangeLog about this.
+
2010-01-26 Ben Wing <ben at xemacs.org>
* postgresql/postgresql.c:
diff -r 19a72041c5ed -r 304aebb79cd3 modules/canna/canna_api.c
--- a/modules/canna/canna_api.c Tue Jan 26 23:22:30 2010 -0600
+++ b/modules/canna/canna_api.c Wed Jan 27 00:35:36 2010 -0600
@@ -199,8 +199,8 @@
static Lisp_Object CANNA_mode_keys (void);
static Lisp_Object Qeuc_jp;
-#define make_euc_string(p, len) make_ext_string ((Extbyte *) p, len, Qeuc_jp)
-#define build_euc_string(p) build_ext_string ((Extbyte *) p, Qeuc_jp)
+#define make_euc_string(p, len) make_extstring ((Extbyte *) p, len, Qeuc_jp)
+#define build_euc_string(p) build_extstring ((Extbyte *) p, Qeuc_jp)
#ifdef CANNA_MULE
static int euc_jp_num_chars (unsigned char *, int);
diff -r 19a72041c5ed -r 304aebb79cd3 modules/ldap/eldap.c
--- a/modules/ldap/eldap.c Tue Jan 26 23:22:30 2010 -0600
+++ b/modules/ldap/eldap.c Wed Jan 27 00:35:36 2010 -0600
@@ -99,7 +99,7 @@
#endif
}
invalid_operation ("LDAP error",
- build_ext_string (ldap_err2string (ldap_err), Qnative));
+ build_extstring (ldap_err2string (ldap_err), Qnative));
}
@@ -346,7 +346,7 @@
if (err != LDAP_SUCCESS)
{
signal_error (Qprocess_error, "Failed binding to the server",
- build_ext_string (ldap_err2string (err), Qnative));
+ build_extstring (ldap_err2string (err), Qnative));
}
ldap = allocate_ldap ();
@@ -535,19 +535,19 @@
dn = ldap_get_dn (ld, e);
if (dn == NULL)
signal_ldap_error (ld, e, 0);
- entry = Fcons (build_ext_string (dn, Qnative), Qnil);
+ entry = Fcons (build_extstring (dn, Qnative), Qnil);
}
for (a = ldap_first_attribute (ld, e, &ptr);
a != NULL;
a = ldap_next_attribute (ld, e, ptr))
{
- list = Fcons (build_ext_string (a, Qnative), Qnil);
+ list = Fcons (build_extstring (a, Qnative), Qnil);
unwind.vals = ldap_get_values_len (ld, e, a);
if (unwind.vals != NULL)
{
for (i = 0; unwind.vals[i] != NULL; i++)
{
- list = Fcons (make_ext_string ((Extbyte *) unwind.vals[i]->bv_val,
+ list = Fcons (make_extstring ((Extbyte *) unwind.vals[i]->bv_val,
unwind.vals[i]->bv_len,
Qnative),
list);
diff -r 19a72041c5ed -r 304aebb79cd3 modules/postgresql/postgresql.c
--- a/modules/postgresql/postgresql.c Tue Jan 26 23:22:30 2010 -0600
+++ b/modules/postgresql/postgresql.c Wed Jan 27 00:35:36 2010 -0600
@@ -244,7 +244,7 @@
if (print_readably)
printing_unreadable_object ("%s", buf);
else
- write_c_string (printcharfun, buf);
+ write_cistring (printcharfun, buf);
}
static Lisp_PGconn *
@@ -365,7 +365,7 @@
if (print_readably)
printing_unreadable_object ("%s", buf);
else
- write_c_string (printcharfun, buf);
+ write_cistring (printcharfun, buf);
}
#undef RESULT_TUPLES_FMT
@@ -445,23 +445,23 @@
pcio = PQconndefaults();
if (!pcio) return Qnil; /* can never happen in libpq-7.0 */
temp =
- list1 (nconc2 (list4 (build_ext_string (pcio[0].keyword, PG_OS_CODING),
- build_ext_string (pcio[0].envvar, PG_OS_CODING),
- build_ext_string (pcio[0].compiled, PG_OS_CODING),
- build_ext_string (pcio[0].val, PG_OS_CODING)),
- list3 (build_ext_string (pcio[0].label, PG_OS_CODING),
- build_ext_string (pcio[0].dispchar, PG_OS_CODING),
+ list1 (nconc2 (list4 (build_extstring (pcio[0].keyword, PG_OS_CODING),
+ build_extstring (pcio[0].envvar, PG_OS_CODING),
+ build_extstring (pcio[0].compiled, PG_OS_CODING),
+ build_extstring (pcio[0].val, PG_OS_CODING)),
+ list3 (build_extstring (pcio[0].label, PG_OS_CODING),
+ build_extstring (pcio[0].dispchar, PG_OS_CODING),
make_int (pcio[0].dispsize))));
for (i = 1; pcio[i].keyword; i++)
{
temp1 =
- list1 (nconc2 (list4 (build_ext_string (pcio[i].keyword, PG_OS_CODING),
- build_ext_string (pcio[i].envvar, PG_OS_CODING),
- build_ext_string (pcio[i].compiled, PG_OS_CODING),
- build_ext_string (pcio[i].val, PG_OS_CODING)),
- list3 (build_ext_string (pcio[i].label, PG_OS_CODING),
- build_ext_string (pcio[i].dispchar, PG_OS_CODING),
+ list1 (nconc2 (list4 (build_extstring (pcio[i].keyword, PG_OS_CODING),
+ build_extstring (pcio[i].envvar, PG_OS_CODING),
+ build_extstring (pcio[i].compiled, PG_OS_CODING),
+ build_extstring (pcio[i].val, PG_OS_CODING)),
+ list3 (build_extstring (pcio[i].label, PG_OS_CODING),
+ build_extstring (pcio[i].dispchar, PG_OS_CODING),
make_int (pcio[i].dispsize))));
{
Lisp_Object args[2];
@@ -834,22 +834,22 @@
/* PQdb Returns the database name of the connection.
char *PQdb(PGconn *conn)
*/
- return build_ext_string (PQdb(P), PG_OS_CODING);
+ return build_extstring (PQdb(P), PG_OS_CODING);
else if (EQ (field, Qpquser))
/* PQuser Returns the user name of the connection.
char *PQuser(PGconn *conn)
*/
- return build_ext_string (PQuser(P), PG_OS_CODING);
+ return build_extstring (PQuser(P), PG_OS_CODING);
else if (EQ (field, Qpqpass))
/* PQpass Returns the password of the connection.
char *PQpass(PGconn *conn)
*/
- return build_ext_string (PQpass(P), PG_OS_CODING);
+ return build_extstring (PQpass(P), PG_OS_CODING);
else if (EQ (field, Qpqhost))
/* PQhost Returns the server host name of the connection.
char *PQhost(PGconn *conn)
*/
- return build_ext_string (PQhost(P), PG_OS_CODING);
+ return build_extstring (PQhost(P), PG_OS_CODING);
else if (EQ (field, Qpqport))
{
char *p;
@@ -865,12 +865,12 @@
/* PQtty Returns the debug tty of the connection.
char *PQtty(PGconn *conn)
*/
- return build_ext_string (PQtty(P), PG_OS_CODING);
+ return build_extstring (PQtty(P), PG_OS_CODING);
else if (EQ (field, Qpqoptions))
/* PQoptions Returns the backend options used in the connection.
char *PQoptions(PGconn *conn)
*/
- return build_ext_string (PQoptions(P), PG_OS_CODING);
+ return build_extstring (PQoptions(P), PG_OS_CODING);
else if (EQ (field, Qpqstatus))
{
ConnStatusType cst;
@@ -899,7 +899,7 @@
by an operation on the connection.
char *PQerrorMessage(PGconn* conn);
*/
- return build_ext_string (PQerrorMessage(P), PG_OS_CODING);
+ return build_extstring (PQerrorMessage(P), PG_OS_CODING);
else if (EQ (field, Qpqbackendpid))
/* PQbackendPID Returns the process ID of the backend server handling
this connection.
@@ -1076,7 +1076,7 @@
R = (XPGRESULT (result))->pgresult;
PUKE_IF_NULL (R);
- return build_ext_string (PQresStatus (PQresultStatus (R)), PG_OS_CODING);
+ return build_extstring (PQresStatus (PQresultStatus (R)), PG_OS_CODING);
}
/* Sundry PGresult accessor functions */
@@ -1091,7 +1091,7 @@
R = (XPGRESULT (result))->pgresult;
PUKE_IF_NULL (R);
- return build_ext_string (PQresultErrorMessage (R), PG_OS_CODING);
+ return build_extstring (PQresultErrorMessage (R), PG_OS_CODING);
}
DEFUN ("pq-ntuples", Fpq_ntuples, 1, 1, 0, /*
@@ -1149,7 +1149,7 @@
R = (XPGRESULT (result))->pgresult;
PUKE_IF_NULL (R);
- return build_ext_string (PQfname (R, XINT (field_index)), PG_OS_CODING);
+ return build_extstring (PQfname (R, XINT (field_index)), PG_OS_CODING);
}
DEFUN ("pq-fnumber", Fpq_fnumber, 2, 2, 0, /*
@@ -1234,7 +1234,7 @@
R = (XPGRESULT (result))->pgresult;
PUKE_IF_NULL (R);
- return build_ext_string (PQgetvalue (R, XINT (tup_num), XINT (field_num)),
+ return build_extstring (PQgetvalue (R, XINT (tup_num), XINT (field_num)),
PG_OS_CODING);
}
@@ -1284,7 +1284,7 @@
R = (XPGRESULT (result))->pgresult;
PUKE_IF_NULL (R);
- return build_ext_string (PQcmdStatus (R), PG_OS_CODING);
+ return build_extstring (PQcmdStatus (R), PG_OS_CODING);
}
DEFUN ("pq-cmd-tuples", Fpq_cmd_tuples, 1, 1, 0, /*
@@ -1298,7 +1298,7 @@
R = (XPGRESULT (result))->pgresult;
PUKE_IF_NULL (R);
- return build_ext_string (PQcmdTuples (R), PG_OS_CODING);
+ return build_extstring (PQcmdTuples (R), PG_OS_CODING);
}
DEFUN ("pq-oid-value", Fpq_oid_value, 1, 1, 0, /*
@@ -1392,7 +1392,7 @@
{
Lisp_Object temp;
- temp = list2 (build_ext_string (PGN->relname, PG_OS_CODING), make_int (PGN->be_pid));
+ temp = list2 (build_extstring (PGN->relname, PG_OS_CODING), make_int (PGN->be_pid));
free ((void *)PGN);
return temp;
}
@@ -1506,7 +1506,7 @@
ret = PQgetline (P, buffer, sizeof (buffer));
- return Fcons (make_int (ret), build_ext_string (buffer, PG_OS_CODING));
+ return Fcons (make_int (ret), build_extstring (buffer, PG_OS_CODING));
}
DEFUN ("pq-put-line", Fpq_put_line, 2, 2, 0, /*
@@ -1575,7 +1575,7 @@
if (ret == -1) return Qt; /* done! */
else if (!ret) return Qnil; /* no data yet */
else return Fcons (make_int (ret),
- make_ext_string ((Extbyte *) buffer, ret, PG_OS_CODING));
+ make_extstring ((Extbyte *) buffer, ret, PG_OS_CODING));
}
DEFUN ("pq-put-nbytes", Fpq_put_nbytes, 2, 2, 0, /*
@@ -1845,7 +1845,7 @@
#define FROB(envvar, var) \
if ((p = egetenv (envvar))) \
- var = build_intstring (p); \
+ var = build_istring (p); \
else \
var = Qnil
diff -r 19a72041c5ed -r 304aebb79cd3 src/.gdbinit.in.in
--- a/src/.gdbinit.in.in Tue Jan 26 23:22:30 2010 -0600
+++ b/src/.gdbinit.in.in Wed Jan 27 00:35:36 2010 -0600
@@ -255,7 +255,7 @@
define leval
-ldp Feval(Fcar(Fread_from_string(build_string($arg0),Qnil,Qnil)))
+ldp Feval(Fcar(Fread_from_string(build_cistring($arg0),Qnil,Qnil)))
end
document leval
diff -r 19a72041c5ed -r 304aebb79cd3 src/ChangeLog
--- a/src/ChangeLog Tue Jan 26 23:22:30 2010 -0600
+++ b/src/ChangeLog Wed Jan 27 00:35:36 2010 -0600
@@ -1,3 +1,217 @@
+2010-01-27 Ben Wing <ben at xemacs.org>
+
+ * .gdbinit.in.in:
+ * README:
+ * abbrev.c (write_abbrev):
+ * abbrev.c (describe_abbrev):
+ * alloc.c (make_extstring):
+ * alloc.c (build_istring):
+ * alloc.c (build_cistring):
+ * alloc.c (build_ascstring):
+ * alloc.c (build_extstring):
+ * alloc.c (build_msg_istring):
+ * alloc.c (build_defer_istring):
+ * buffer.c (Fgenerate_new_buffer_name):
+ * buffer.c (init_buffer_2):
+ * console-tty.c (tty_init_console):
+ * console-x.c (get_display_arg_connection):
+ * console-x.c (x_perhaps_init_unseen_key_defaults):
+ * database.c (dbm_map):
+ * database.c (dbm_get):
+ * database.c (berkdb_get):
+ * database.c (berkdb_map):
+ * device-gtk.c (FROB_PIXMAP):
+ * device-gtk.c (Fgtk_style_info):
+ * device-msw.c (msprinter_default_printer):
+ * device-msw.c (sync_printer_with_devmode):
+ * device-x.c (coding_system_of_xrm_database):
+ * device-x.c (x_init_device):
+ * device-x.c (signal_if_x_error):
+ * device-x.c (Fx_get_resource):
+ * device-x.c (Fx_server_vendor):
+ * device-x.c (Fx_get_font_path):
+ * dialog-x.c (maybe_run_dbox_text_callback):
+ * doc.c (extract_object_file_name):
+ * doc.c (unparesseuxify_doc_string):
+ * doc.c (get_doc_string):
+ * doc.c (get_object_file_name):
+ * doc.c (Fdocumentation):
+ * doc.c (Fsnarf_documentation):
+ * doc.c (Fsubstitute_command_keys):
+ * editfns.c (init_editfns):
+ * editfns.c (Ftemp_directory):
+ * editfns.c (Fuser_login_name):
+ * editfns.c (Fuser_real_login_name):
+ * editfns.c (Fuser_home_directory):
+ * editfns.c (Fformat_time_string):
+ * editfns.c (Fcurrent_time_string):
+ * editfns.c (Fcurrent_time_zone):
+ * emacs.c:
+ * emacs.c (main_1):
+ * emodules.c (Flist_modules):
+ * emodules.c (emodules_load):
+ * emodules.c (emodules_doc_sym):
+ * emodules.c (vars_of_module):
+ * event-Xt.c (x_has_keysym):
+ * event-gtk.c (emacs_gtk_format_magic_event):
+ * event-gtk.c (dragndrop_data_received):
+ * event-gtk.c (gtk_reset_key_mapping):
+ * event-msw.c (mswindows_dde_callback):
+ * event-msw.c (mswindows_wnd_proc):
+ * faces.c (complex_vars_of_faces):
+ * file-coding.c (find_coding_system):
+ * file-coding.c (setup_eol_coding_systems):
+ * file-coding.c (make_coding_system_1):
+ * file-coding.c (snarf_coding_system):
+ * fileio.c:
+ * fileio.c (lisp_strerror):
+ * fileio.c (Ffile_name_directory):
+ * fileio.c (Ffile_name_as_directory):
+ * fileio.c (Fdirectory_file_name):
+ * fileio.c (if):
+ * fileio.c (Ffile_symlink_p):
+ * fileio.c (Fencrypt_string):
+ * fileio.c (Fdecrypt_string):
+ * filelock.c (lock_file):
+ * filelock.c (Ffile_locked_p):
+ * floatfns.c (matherr):
+ * font-mgr.c (build_fcapi_string):
+ * font-mgr.c (make_xlfd_font_regexp):
+ * frame-msw.c (mswindows_window_id):
+ * frame-msw.c (mswindows_frame_property):
+ * frame-x.c:
+ * frame-x.c (color_to_string):
+ * frame-x.c (maybe_set_frame_title_format):
+ * frame-x.c (x_cde_transfer_callback):
+ * frame-x.c (Fx_window_id):
+ * glade.c (connector):
+ * glade.c (Fglade_xml_textdomain):
+ * glade.c (syms_of_glade):
+ * glyphs-eimage.c (jpeg_instantiate):
+ * glyphs-eimage.c (png_instantiate):
+ * glyphs-eimage.c (tiff_instantiate):
+ * glyphs-gtk.c (font_instantiate):
+ * glyphs-gtk.c (BUILD_GLYPH_INST):
+ * glyphs-x.c (x_locate_pixmap_file):
+ * glyphs-x.c (font_instantiate):
+ * glyphs-x.c (x_widget_property):
+ * glyphs-x.c (BUILD_GLYPH_INST):
+ * glyphs.c (print_image_instance):
+ * glyphs.c (bitmap_to_lisp_data):
+ * glyphs.c (pixmap_to_lisp_data):
+ * gpmevent.c (turn_off_gpm):
+ * gpmevent.c (Fgpm_enabled_p):
+ * gpmevent.c (Fgpm_enable):
+ * gtk-glue.c (__make_string_mapper):
+ * gtk-glue.c (xemacs_gtklist_to_list):
+ * gtk-xemacs.c (FROB_FACE):
+ * gtk-xemacs.c (xemacs_gtk_convert_color):
+ * hpplay.c (player_error_internal):
+ * hpplay.c (myHandler):
+ * insdel.c (buffer_insert_ascstring_1):
+ * insdel.h:
+ * insdel.h (buffer_insert_ascstring):
+ * intl.c (Fcurrent_locale):
+ * intl.c (Fset_current_locale):
+ * keymap.c (make_key_description):
+ * keymap.c (Ftext_char_description):
+ * keymap.c (describe_command):
+ * keymap.c (describe_map):
+ * lisp.h:
+ * lread.c:
+ * lread.c (locate_file_in_directory_mapper):
+ * lread.c (locate_file_construct_suffixed_files_mapper):
+ * mule-charset.c (Fmake_charset):
+ * nt.c (Fmswindows_short_file_name):
+ * nt.c (Fmswindows_long_file_name):
+ * objects-gtk.c (__get_gtk_font_truename):
+ * objects-gtk.c (__gtk_font_list_internal):
+ * objects-msw.c (font_enum_callback_2):
+ * objects-msw.c (create_hfont_from_font_spec):
+ * objects-msw.c (mswindows_font_list):
+ * objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
+ * objects-tty.c (tty_initialize_font_instance):
+ * objects-x.c (x_font_truename):
+ * objects-x.c (x_font_instance_truename):
+ * objects-x.c (x_font_instance_properties):
+ * objects-x.c (x_font_list):
+ * print.c (write_cistring):
+ * print.c (print_vector_internal):
+ * print.c (print_cons):
+ * process-nt.c (nt_canonicalize_host_name):
+ * process-unix.c (unix_create_process):
+ * process-unix.c (unix_canonicalize_host_name):
+ * process.c (status_message):
+ * process.c (status_notify):
+ * process.c (init_xemacs_process):
+ * process.c (syms_of_process):
+ * redisplay-tty.c (term_get_fkeys_1):
+ * redisplay-tty.c (CONDITIONAL_REASSIGN):
+ * search.c (compile_pattern_1):
+ * select-common.h (selection_data_to_lisp_data):
+ * select-gtk.c (atom_to_symbol):
+ * select-gtk.c (PROCESSING_GTK_CODE):
+ * select-msw.c (mswindows_get_foreign_selection):
+ * select-x.c (x_atom_to_symbol):
+ * select-x.c (Fx_get_cutbuffer_internal):
+ * symbols.c (intern_istring):
+ * symbols.c (intern):
+ * symbols.c (intern_converting_underscores_to_dashes):
+ * symbols.c (Fintern):
+ * sysdep.c (init_system_name):
+ * sysdll.c (dll_error):
+ * sysdll.c (dll_open):
+ * syswindows.h:
+ * syswindows.h (build_tstr_string):
+ * tests.c (DFC_CHECK_LENGTH):
+ * tests.c (DFC_CHECK_CONTENT):
+ * tests.c (DFC_RESULT_PASS):
+ * tests.c (Ftest_data_format_conversion):
+ * text.c:
+ * text.c (new_dfc_convert_now_damn_it):
+ * text.h:
+ * text.h (build_wext_string):
+ * tooltalk.c (tt_build_c_string):
+ * tooltalk.c (Ftooltalk_default_procid):
+ * tooltalk.c (Ftooltalk_default_session):
+ * tooltalk.c (init_tooltalk):
+ * ui-byhand.c (Fgtk_clist_get_text):
+ * ui-byhand.c (Fgtk_clist_get_pixtext):
+ * ui-byhand.c (Fgtk_label_get):
+ * ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
+ * ui-gtk.c (emacs_gtk_object_printer):
+ * ui-gtk.c (emacs_gtk_boxed_printer):
+ * ui-gtk.c (gtk_type_to_lisp):
+ * ui-gtk.c (symbol_to_enum):
+ * ui-gtk.c (enum_to_symbol):
+ * unexaix.c (report_error):
+ * unexaix.c (ERROR0):
+ * unexec.c (report_error):
+ * unexec.c (ERROR0):
+ * unicode.c (unicode_to_ichar):
+ * win32.c (tstr_to_local_file_format):
+ * win32.c (Fmswindows_cygwin_to_win32_path):
+ * win32.c (struct read_link_hash):
+ * xemacs.def.in.in:
+
+ Rename:
+
+ write_c_string -> write_cistring
+ build_intstring -> build_istring
+ build_string -> build_cistring
+ build_ext_string -> build_extstring
+ make_ext_string -> make_extstring
+ buffer_insert_c_string -> buffer_insert_ascstring
+ intern_int -> intern_istring
+
+ These functions have been renamed so that the naming harmonizes
+ with the typedefs for strings: `cistring' along with CIbyte *,
+ `istring' along with Ibyte *, `extstring' along with Extbyte *,
+ `ascstring' along with Ascbyte *.
+
+ Also make buffer_insert_ascstring take Ascbyte * and assert
+ that its argument is ASCII.
+
2010-01-26 Ben Wing <ben at xemacs.org>
* alloc.c:
diff -r 19a72041c5ed -r 304aebb79cd3 src/README
--- a/src/README Tue Jan 26 23:22:30 2010 -0600
+++ b/src/README Wed Jan 27 00:35:36 2010 -0600
@@ -61,7 +61,7 @@
eval.c for a classification of various error functions.
-- Constant strings occurring in source files need to get wrapped
- in a call to GETTEXT (or if inside of a call to `build_string',
+ in a call to GETTEXT (or if inside of a call to `build_ascstring',
change that function to `build_translated_string') if they don't
occur in certain places where the I18N3 message snarfer will see
them. For a complete discussion of this, see the file
diff -r 19a72041c5ed -r 304aebb79cd3 src/abbrev.c
--- a/src/abbrev.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/abbrev.c Wed Jan 27 00:35:36 2010 -0600
@@ -424,16 +424,16 @@
if (NILP (XSYMBOL_VALUE (sym)) || ! NILP (system_flag))
return;
- buffer_insert_c_string (buf, " (");
+ buffer_insert_ascstring (buf, " (");
name = Fsymbol_name (sym);
Fprin1 (name, stream);
- buffer_insert_c_string (buf, " ");
+ buffer_insert_ascstring (buf, " ");
Fprin1 (XSYMBOL_VALUE (sym), stream);
- buffer_insert_c_string (buf, " ");
+ buffer_insert_ascstring (buf, " ");
Fprin1 (XSYMBOL (sym)->function, stream);
- buffer_insert_c_string (buf, " ");
+ buffer_insert_ascstring (buf, " ");
Fprin1 (count, stream);
- buffer_insert_c_string (buf, ")\n");
+ buffer_insert_ascstring (buf, ")\n");
}
static void
@@ -462,7 +462,7 @@
if (!NILP (system_flag))
{
- buffer_insert_c_string (buf, " (sys)");
+ buffer_insert_ascstring (buf, " (sys)");
Findent_to (make_int (20), one, Qnil);
}
else
@@ -476,7 +476,7 @@
Findent_to (make_int (45), one, Qnil);
Fprin1 (XSYMBOL (sym)->function, stream);
}
- buffer_insert_c_string (buf, "\n");
+ buffer_insert_ascstring (buf, "\n");
}
static int
@@ -528,28 +528,28 @@
if (!NILP (readable))
{
- buffer_insert_c_string (buf, "(");
+ buffer_insert_ascstring (buf, "(");
Fprin1 (name, stream);
- buffer_insert_c_string (buf, ")\n\n");
+ buffer_insert_ascstring (buf, ")\n\n");
while (! NILP (symbols))
{
describe_abbrev (XCAR (symbols), stream);
symbols = XCDR (symbols);
}
- buffer_insert_c_string (buf, "\n\n");
+ buffer_insert_ascstring (buf, "\n\n");
}
else
{
- buffer_insert_c_string (buf, "(define-abbrev-table '");
+ buffer_insert_ascstring (buf, "(define-abbrev-table '");
Fprin1 (name, stream);
- buffer_insert_c_string (buf, " '(\n");
+ buffer_insert_ascstring (buf, " '(\n");
while (! NILP (symbols))
{
write_abbrev (XCAR (symbols), stream);
symbols = XCDR (symbols);
}
- buffer_insert_c_string (buf, " ))\n\n");
+ buffer_insert_ascstring (buf, " ))\n\n");
}
return Qnil;
diff -r 19a72041c5ed -r 304aebb79cd3 src/alloc.c
--- a/src/alloc.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/alloc.c Wed Jan 27 00:35:36 2010 -0600
@@ -2874,7 +2874,7 @@
/* Take some raw memory, encoded in some external data format,
and convert it into a Lisp string. */
Lisp_Object
-make_ext_string (const Extbyte *contents, EMACS_INT length,
+make_extstring (const Extbyte *contents, EMACS_INT length,
Lisp_Object coding_system)
{
Lisp_Object string;
@@ -2885,30 +2885,30 @@
}
Lisp_Object
-build_intstring (const Ibyte *str)
+build_istring (const Ibyte *str)
{
/* Some strlen's crash and burn if passed null. */
return make_string (str, (str ? qxestrlen (str) : (Bytecount) 0));
}
Lisp_Object
-build_string (const CIbyte *str)
-{
- return build_intstring ((const Ibyte *) str);
+build_cistring (const CIbyte *str)
+{
+ return build_istring ((const Ibyte *) str);
}
Lisp_Object
build_ascstring (const Ascbyte *str)
{
ASSERT_ASCTEXT_ASCII (str);
- return build_intstring ((const Ibyte *) str);
-}
-
-Lisp_Object
-build_ext_string (const Extbyte *str, Lisp_Object coding_system)
+ return build_istring ((const Ibyte *) str);
+}
+
+Lisp_Object
+build_extstring (const Extbyte *str, Lisp_Object coding_system)
{
/* Some strlen's crash and burn if passed null. */
- return make_ext_string ((const Extbyte *) str,
+ return make_extstring ((const Extbyte *) str,
(str ? dfc_external_data_len (str, coding_system) :
0),
coding_system);
@@ -2920,7 +2920,7 @@
Lisp_Object
build_msg_istring (const Ibyte *str)
{
- return build_intstring (IGETTEXT (str));
+ return build_istring (IGETTEXT (str));
}
/* Build a string whose content is a translatable message, and translate
@@ -2956,7 +2956,7 @@
Lisp_Object
build_defer_istring (const Ibyte *str)
{
- Lisp_Object retval = build_intstring ((Ibyte *) str);
+ Lisp_Object retval = build_istring ((Ibyte *) str);
/* Possibly do something to the return value */
return retval;
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/buffer.c
--- a/src/buffer.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/buffer.c Wed Jan 27 00:35:36 2010 -0600
@@ -788,7 +788,7 @@
while (1)
{
qxesprintf (number, "<%d>", ++count);
- gentemp = concat2 (name, build_intstring (number));
+ gentemp = concat2 (name, build_istring (number));
if (!NILP (ignore))
{
tem = Fstring_equal (gentemp, ignore);
@@ -2999,7 +2999,7 @@
/* This function can GC */
Fset_buffer (Fget_buffer (QSscratch));
- current_buffer->directory = build_intstring (initial_directory);
+ current_buffer->directory = build_istring (initial_directory);
#if 0 /* FSFmacs */
/* #### is this correct? */
diff -r 19a72041c5ed -r 304aebb79cd3 src/console-tty.c
--- a/src/console-tty.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/console-tty.c Wed Jan 27 00:35:36 2010 -0600
@@ -114,7 +114,7 @@
invalid_state ("Cannot determine terminal type", Qunbound);
}
else
- terminal_type = build_intstring (temp_type);
+ terminal_type = build_istring (temp_type);
}
/* Determine the controlling process */
diff -r 19a72041c5ed -r 304aebb79cd3 src/console-x.c
--- a/src/console-x.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/console-x.c Wed Jan 27 00:35:36 2010 -0600
@@ -162,12 +162,12 @@
/* assert: display_arg is only set if we found the display
arg earlier so we can't fail to find it now. */
assert (disp_name != NULL);
- conn = build_ext_string (disp_name, Qcommand_argument_encoding);
+ conn = build_extstring (disp_name, Qcommand_argument_encoding);
free_argc_argv (argv);
return conn;
}
else
- return build_ext_string (XDisplayName (0), Qx_display_name_encoding);
+ return build_extstring (XDisplayName (0), Qx_display_name_encoding);
}
/* "semi-canonicalize" means convert to a nicer form for printing, but
@@ -335,7 +335,7 @@
CHECK_CHAR(key);
buf[set_itext_ichar(buf, XCHAR(key))] = '\0';
- key_name = build_intstring (buf);
+ key_name = build_istring (buf);
/* We need to do the lookup and compare later, because we can't check
the Qcharacter_of_keysym property belonging to an actual character. */
diff -r 19a72041c5ed -r 304aebb79cd3 src/database.c
--- a/src/database.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/database.c Wed Jan 27 00:35:36 2010 -0600
@@ -327,9 +327,9 @@
keydatum = dbm_nextkey (db->dbm_handle))
{
valdatum = dbm_fetch (db->dbm_handle, keydatum);
- key = make_ext_string ((Extbyte *) keydatum.dptr, keydatum.dsize,
+ key = make_extstring ((Extbyte *) keydatum.dptr, keydatum.dsize,
db->coding_system);
- val = make_ext_string ((Extbyte *) valdatum.dptr, valdatum.dsize,
+ val = make_extstring ((Extbyte *) valdatum.dptr, valdatum.dsize,
db->coding_system);
call2 (func, key, val);
}
@@ -346,7 +346,7 @@
valdatum = dbm_fetch (db->dbm_handle, keydatum);
return (valdatum.dptr
- ? make_ext_string ((Extbyte *) valdatum.dptr, valdatum.dsize,
+ ? make_extstring ((Extbyte *) valdatum.dptr, valdatum.dsize,
db->coding_system)
: Qnil);
}
@@ -473,7 +473,7 @@
#endif /* DB_VERSION_MAJOR */
if (!status)
- return make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
+ return make_extstring ((const Extbyte *) valdatum.data, valdatum.size,
db->coding_system);
#if DB_VERSION_MAJOR == 1
@@ -564,9 +564,9 @@
status == 0;
status = dbp->seq (dbp, &keydatum, &valdatum, R_NEXT))
{
- key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size,
+ key = make_extstring ((const Extbyte *) keydatum.data, keydatum.size,
db->coding_system);
- val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
+ val = make_extstring ((const Extbyte *) valdatum.data, valdatum.size,
db->coding_system);
call2 (func, key, val);
}
@@ -583,9 +583,9 @@
status == 0;
status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))
{
- key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size,
+ key = make_extstring ((const Extbyte *) keydatum.data, keydatum.size,
db->coding_system);
- val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
+ val = make_extstring ((const Extbyte *) valdatum.data, valdatum.size,
db->coding_system);
call2 (func, key, val);
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/device-gtk.c
--- a/src/device-gtk.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/device-gtk.c Wed Jan 27 00:35:36 2010 -0600
@@ -666,7 +666,7 @@
result = nconc2 (result, list2 (Qfont, convert_font (style->font)));
-#define FROB_PIXMAP(state) (style->rc_style->bg_pixmap_name[state] ? build_string (style->rc_style->bg_pixmap_name[state]) : Qnil)
+#define FROB_PIXMAP(state) (style->rc_style->bg_pixmap_name[state] ? build_cistring (style->rc_style->bg_pixmap_name[state]) : Qnil)
if (style->rc_style)
result = nconc2 (result, list2 (Qbackground,
diff -r 19a72041c5ed -r 304aebb79cd3 src/device-msw.c
--- a/src/device-msw.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/device-msw.c Wed Jan 27 00:35:36 2010 -0600
@@ -507,7 +507,7 @@
name[] or ALLOCA ()ed */
qxestrtok (nameint, ",");
- return build_intstring (nameint);
+ return build_istring (nameint);
}
@@ -672,7 +672,7 @@
Ibyte new_connext[20];
qxesprintf (new_connext, ":%X", d->header.uid);
- new_connection = concat2 (devname, build_intstring (new_connext));
+ new_connection = concat2 (devname, build_istring (new_connext));
}
DEVICE_CONNECTION (d) = new_connection;
diff -r 19a72041c5ed -r 304aebb79cd3 src/device-x.c
--- a/src/device-x.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/device-x.c Wed Jan 27 00:35:36 2010 -0600
@@ -210,7 +210,7 @@
last_xrm_db = db;
locale = XrmLocaleOfDatabase (db);
- localestr = build_ext_string (locale, Qbinary);
+ localestr = build_extstring (locale, Qbinary);
last_coding_system = call1 (Qget_coding_system_from_locale, localestr);
return last_coding_system;
@@ -667,7 +667,7 @@
}
/* need to update Vx_emacs_application_class: */
- Vx_emacs_application_class = build_string (app_class);
+ Vx_emacs_application_class = build_cistring (app_class);
}
slow_down_interrupts ();
@@ -1198,19 +1198,19 @@
return 0;
data = Qnil;
qxesprintf (num, "0x%X", (unsigned int) last_error.resourceid);
- data = Fcons (build_intstring (num), data);
+ data = Fcons (build_istring (num), data);
qxesprintf (num, "%d", last_error.request_code);
XGetErrorDatabaseText (last_error.display, "XRequest", (char *) num, "",
buf, sizeof (buf));
if (*buf)
- data = Fcons (build_ext_string (buf, Qx_error_message_encoding), data);
+ data = Fcons (build_extstring (buf, Qx_error_message_encoding), data);
else
{
qxesprintf (num, "Request-%d", last_error.request_code);
- data = Fcons (build_intstring (num), data);
+ data = Fcons (build_istring (num), data);
}
XGetErrorText (last_error.display, last_error.error_code, buf, sizeof (buf));
- data = Fcons (build_ext_string (buf, Qx_error_message_encoding), data);
+ data = Fcons (build_extstring (buf, Qx_error_message_encoding), data);
again:
Fsignal (Qx_error, data);
if (! resumable_p) goto again;
@@ -1605,7 +1605,7 @@
}
if (EQ (type, Qstring))
- return build_ext_string (raw_result, codesys);
+ return build_extstring (raw_result, codesys);
else if (EQ (type, Qboolean))
{
if (!strcasecmp (raw_result, "off") ||
@@ -1618,8 +1618,8 @@
return Fcons (Qt, Qnil);
return maybe_signal_continuable_error_2
(Qinvalid_operation, "Can't convert to a Boolean",
- build_ext_string (name_string, Qbinary),
- build_ext_string (raw_result, codesys), Qresource,
+ build_extstring (name_string, Qbinary),
+ build_extstring (raw_result, codesys), Qresource,
errb);
}
else if (EQ (type, Qinteger) || EQ (type, Qnatnum))
@@ -1629,13 +1629,13 @@
if (1 != sscanf (raw_result, "%d%c", &i, &c))
return maybe_signal_continuable_error_2
(Qinvalid_operation, "Can't convert to an integer",
- build_ext_string (name_string, Qbinary),
- build_ext_string (raw_result, codesys), Qresource,
+ build_extstring (name_string, Qbinary),
+ build_extstring (raw_result, codesys), Qresource,
errb);
else if (EQ (type, Qnatnum) && i < 0)
return maybe_signal_continuable_error_2
(Qinvalid_argument, "Invalid numerical value for resource",
- make_int (i), build_ext_string (name_string, Qbinary),
+ make_int (i), build_extstring (name_string, Qbinary),
Qresource, errb);
else
return make_int (i);
@@ -1803,7 +1803,7 @@
Display *dpy = get_x_display (device);
Extbyte *vendor = ServerVendor (dpy);
- return build_ext_string (vendor ? vendor : "", Qx_hpc_encoding);
+ return build_extstring (vendor ? vendor : "", Qx_hpc_encoding);
}
DEFUN ("x-server-version", Fx_server_version, 0, 1, 0, /*
@@ -2048,7 +2048,7 @@
gui_error ("Can't get X font path", device);
while (ndirs_return--)
- font_path = Fcons (build_ext_string (directories[ndirs_return],
+ font_path = Fcons (build_extstring (directories[ndirs_return],
Qfile_name),
font_path);
diff -r 19a72041c5ed -r 304aebb79cd3 src/dialog-x.c
--- a/src/dialog-x.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/dialog-x.c Wed Jan 27 00:35:36 2010 -0600
@@ -58,7 +58,7 @@
void *tmp =
LISP_TO_VOID (cons3 (Qnil,
list2 (text_field_callback,
- build_ext_string (text_field_value,
+ build_extstring (text_field_value,
Qlwlib_encoding)),
Qnil));
popup_selection_callback (0, id, (XtPointer) tmp);
diff -r 19a72041c5ed -r 304aebb79cd3 src/doc.c
--- a/src/doc.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/doc.c Wed Jan 27 00:35:36 2010 -0600
@@ -65,7 +65,7 @@
if (0 > lseek (fd, position, 0))
{
if (name_nonreloc)
- name_reloc = build_intstring (name_nonreloc);
+ name_reloc = build_istring (name_nonreloc);
return_me = list3 (build_msg_string
("Position out of range in doc string file"),
name_reloc, make_int (position));
@@ -180,7 +180,7 @@
if (0 > lseek (fd, position, 0))
{
if (name_nonreloc)
- name_reloc = build_intstring (name_nonreloc);
+ name_reloc = build_istring (name_nonreloc);
return_me = list3 (build_msg_string
("Position out of range in doc string file"),
name_reloc, make_int (position));
@@ -378,7 +378,7 @@
if (fd < 0)
report_file_error ("Cannot open doc string file",
- name_nonreloc ? build_intstring (name_nonreloc) :
+ name_nonreloc ? build_istring (name_nonreloc) :
name_reloc);
}
@@ -475,7 +475,7 @@
if (fd < 0)
report_file_error ("Cannot open doc string file",
- name_nonreloc ? build_intstring (name_nonreloc) :
+ name_nonreloc ? build_istring (name_nonreloc) :
name_reloc);
}
@@ -599,7 +599,7 @@
if (XSUBR (fun)->doc == 0)
return Qnil;
if ((EMACS_INT) XSUBR (fun)->doc >= 0)
- doc = build_string (XSUBR (fun)->doc);
+ doc = build_cistring (XSUBR (fun)->doc);
else
doc = get_doc_string (make_int (- (EMACS_INT) XSUBR (fun)->doc));
}
@@ -754,7 +754,7 @@
fd = qxe_open (name, O_RDONLY | OPEN_BINARY, 0);
if (fd < 0)
- report_file_error ("Opening doc string file", build_intstring (name));
+ report_file_error ("Opening doc string file", build_istring (name));
Vinternal_doc_file_name = filename;
filled = 0;
pos = 0;
@@ -1243,9 +1243,9 @@
if (NILP (tem))
{
- buffer_insert_c_string (buf_, "(uses keymap \"");
+ buffer_insert_ascstring (buf_, "(uses keymap \"");
buffer_insert_lisp_string (buf_, Fsymbol_name (name));
- buffer_insert_c_string (buf_, "\", which is not currently defined) ");
+ buffer_insert_ascstring (buf_, "\", which is not currently defined) ");
if (start[-1] == '<') keymap = Qnil;
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/editfns.c
--- a/src/editfns.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/editfns.c Wed Jan 27 00:35:36 2010 -0600
@@ -95,7 +95,7 @@
if ((p = egetenv ("NAME")))
/* I don't think it's the right thing to do the ampersand
modification on NAME. Not that it matters anymore... -hniksic */
- Vuser_full_name = build_intstring (p);
+ Vuser_full_name = build_istring (p);
else
Vuser_full_name = Fuser_full_name (Qnil);
}
@@ -649,7 +649,7 @@
}
#endif
- return build_intstring (tmpdir);
+ return build_istring (tmpdir);
}
DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /*
@@ -678,7 +678,7 @@
/* #### - I believe this should return nil instead of "unknown" when pw==0
pw=0 is indicated by a null return from user_login_name
*/
- return returned_name ? build_intstring (returned_name) : Qnil;
+ return returned_name ? build_istring (returned_name) : Qnil;
}
/* This function may be called from other C routines when a
@@ -744,7 +744,7 @@
struct passwd *pw = qxe_getpwuid (getuid ());
/* #### - I believe this should return nil instead of "unknown" when pw==0 */
- return build_ext_string (pw ? pw->pw_name : "unknown", Quser_name_encoding);
+ return build_extstring (pw ? pw->pw_name : "unknown", Quser_name_encoding);
}
DEFUN ("user-uid", Fuser_uid, 0, 0, 0, /*
@@ -895,7 +895,7 @@
Ibyte *path = get_home_directory ();
return !path ? Qnil :
- Fexpand_file_name (Fsubstitute_in_file_name (build_intstring (path)),
+ Fexpand_file_name (Fsubstitute_in_file_name (build_istring (path)),
Qnil);
}
@@ -1078,7 +1078,7 @@
Qtime_function_encoding);
if (emacs_strftime (buf, size, formext, &tm)
|| !*buf)
- return build_ext_string (buf, Qtime_function_encoding);
+ return build_extstring (buf, Qtime_function_encoding);
/* If buffer was too small, make it bigger. */
size *= 2;
}
@@ -1237,7 +1237,7 @@
{
time_t value;
Ibyte *the_ctime;
- EMACS_INT len; /* this is what make_ext_string() accepts; ####
+ EMACS_INT len; /* this is what make_extstring() accepts; ####
should it be an Bytecount? */
if (! lisp_to_time (specified_time, &value))
@@ -1320,7 +1320,7 @@
#endif
#endif /* not HAVE_TM_ZONE */
if (s)
- tem = build_ext_string (s, Qtime_zone_encoding);
+ tem = build_extstring (s, Qtime_zone_encoding);
else
{
Ibyte buf[6];
@@ -1329,7 +1329,7 @@
int am = (offset < 0 ? -offset : offset) / 60;
qxesprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60,
am%60);
- tem = build_intstring (buf);
+ tem = build_istring (buf);
}
return list2 (make_int (offset), tem);
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/emacs.c
--- a/src/emacs.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/emacs.c Wed Jan 27 00:35:36 2010 -0600
@@ -2010,8 +2010,8 @@
-- Fset() on a symbol that is unbound
-- Any of the object-creating functions in alloc.c: e.g.
- make_string()
- - build_intstring()
- - build_string()
+ - build_istring()
+ - build_cistring()
- build_ascstring()
- make_vector()
- make_int()
@@ -2633,7 +2633,7 @@
if (XSTRING_DATA (Vinvocation_name)[0] == '-')
{
/* XEmacs as a login shell, oh goody! */
- Vinvocation_name = build_intstring (egetenv ("SHELL"));
+ Vinvocation_name = build_istring (egetenv ("SHELL"));
}
Vinvocation_directory = Vinvocation_name;
@@ -4477,14 +4477,14 @@
For example, this may be \"xemacs\" or \"infodock\".
This is mainly meant for use in path searching.
*/ );
- Vemacs_program_name = build_ext_string (PATH_PROGNAME, Qfile_name);
+ Vemacs_program_name = build_extstring (PATH_PROGNAME, Qfile_name);
DEFVAR_LISP ("emacs-program-version", &Vemacs_program_version /*
*Version of the Emacs variant.
This typically has the form NN.NN-bNN.
This is mainly meant for use in path searching.
*/ );
- Vemacs_program_version = build_ext_string (PATH_VERSION, Qfile_name);
+ Vemacs_program_version = build_extstring (PATH_VERSION, Qfile_name);
DEFVAR_LISP ("exec-path", &Vexec_path /*
*List of directories to search programs to run in subprocesses.
@@ -4504,7 +4504,7 @@
*/ );
#ifdef PATH_EXEC
Vconfigure_exec_directory = Ffile_name_as_directory
- (build_ext_string (PATH_EXEC, Qfile_name));
+ (build_extstring (PATH_EXEC, Qfile_name));
#else
Vconfigure_exec_directory = Qnil;
#endif
@@ -4520,7 +4520,7 @@
*/ );
#ifdef PATH_LOADSEARCH
Vconfigure_lisp_directory = Ffile_name_as_directory
- (build_ext_string (PATH_LOADSEARCH, Qfile_name));
+ (build_extstring (PATH_LOADSEARCH, Qfile_name));
#else
Vconfigure_lisp_directory = Qnil;
#endif
@@ -4536,7 +4536,7 @@
*/ );
#ifdef PATH_MULELOADSEARCH
Vconfigure_mule_lisp_directory = Ffile_name_as_directory
- (build_ext_string (PATH_MULELOADSEARCH, Qfile_name);
+ (build_extstring (PATH_MULELOADSEARCH, Qfile_name);
#else
Vconfigure_mule_lisp_directory = Qnil;
#endif
@@ -4552,7 +4552,7 @@
*/ );
#ifdef PATH_MODULESEARCH
Vconfigure_module_directory = Ffile_name_as_directory
- (build_ext_string (PATH_MODULESEARCH, Qfile_name));
+ (build_extstring (PATH_MODULESEARCH, Qfile_name));
#else
Vconfigure_module_directory = Qnil;
#endif
@@ -4612,7 +4612,7 @@
*/ );
#ifdef PATH_DATA
Vconfigure_data_directory = Ffile_name_as_directory
- (build_ext_string (PATH_DATA, Qfile_name));
+ (build_extstring (PATH_DATA, Qfile_name));
#else
Vconfigure_data_directory = Qnil;
#endif
@@ -4634,7 +4634,7 @@
*/ );
#ifdef PATH_SITE
Vconfigure_site_directory = Ffile_name_as_directory
- (build_ext_string (PATH_SITE, Qfile_name));
+ (build_extstring (PATH_SITE, Qfile_name));
#else
Vconfigure_site_directory = Qnil;
#endif
@@ -4650,7 +4650,7 @@
*/ );
#ifdef PATH_SITE_MODULES
Vconfigure_site_module_directory = Ffile_name_as_directory
- (build_ext_string (PATH_SITE_MODULES, Qfile_name));
+ (build_extstring (PATH_SITE_MODULES, Qfile_name));
#else
Vconfigure_site_module_directory = Qnil;
#endif
@@ -4667,7 +4667,7 @@
*/ );
#ifdef PATH_DOC
Vconfigure_doc_directory = Ffile_name_as_directory
- (build_ext_string (PATH_DOC, Qfile_name));
+ (build_extstring (PATH_DOC, Qfile_name));
#else
Vconfigure_doc_directory = Qnil;
#endif
@@ -4678,7 +4678,7 @@
*/ );
#ifdef PATH_EXEC_PREFIX
Vconfigure_exec_prefix_directory = Ffile_name_as_directory
- (build_ext_string (PATH_EXEC_PREFIX, Qfile_name));
+ (build_extstring (PATH_EXEC_PREFIX, Qfile_name));
#else
Vconfigure_exec_prefix_directory = Qnil;
#endif
@@ -4689,7 +4689,7 @@
*/ );
#ifdef PATH_PREFIX
Vconfigure_prefix_directory = Ffile_name_as_directory
- (build_ext_string (PATH_PREFIX, Qfile_name));
+ (build_extstring (PATH_PREFIX, Qfile_name));
#else
Vconfigure_prefix_directory = Qnil;
#endif
@@ -4702,7 +4702,7 @@
*/ );
#ifdef PATH_INFO
Vconfigure_info_directory =
- Ffile_name_as_directory (build_ext_string (PATH_INFO, Qfile_name));
+ Ffile_name_as_directory (build_extstring (PATH_INFO, Qfile_name));
#else
Vconfigure_info_directory = Qnil;
#endif
diff -r 19a72041c5ed -r 304aebb79cd3 src/emodules.c
--- a/src/emodules.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/emodules.c Wed Jan 27 00:35:36 2010 -0600
@@ -201,10 +201,10 @@
for (i = 0; i < modnum; i++)
{
if (modules[i].used == 1)
- mlist = Fcons (list4 (build_intstring (modules[i].soname),
- build_intstring (modules[i].modname),
- build_intstring (modules[i].modver),
- build_intstring (modules[i].modtitle)), mlist);
+ mlist = Fcons (list4 (build_istring (modules[i].soname),
+ build_istring (modules[i].modname),
+ build_istring (modules[i].modver),
+ build_istring (modules[i].modtitle)), mlist);
}
return mlist;
@@ -361,7 +361,7 @@
invalid_argument ("Empty module name", Qunbound);
GCPRO4 (filename, foundname, old_load_list, lisp_modname);
- filename = build_intstring (module);
+ filename = build_istring (module);
if (locate_file (Vmodule_load_path, filename, Vmodule_extensions,
&foundname, 0) < 0)
signal_error (Qdll_error, "Cannot open dynamic module", filename);
@@ -428,7 +428,7 @@
{
missing_symbol:
signal_error (Qdll_error, "Invalid dynamic module: Missing symbol",
- build_intstring (symname));
+ build_istring (symname));
}
qxestrcpy_ascii (symname, "vars_of_");
@@ -558,7 +558,7 @@
if (SYMBOLP (sym))
{
- docstr = build_intstring (doc);
+ docstr = build_istring (doc);
GCPRO1 (docstr);
Fput (sym, Qvariable_documentation, docstr);
UNGCPRO;
@@ -612,7 +612,7 @@
the dynamic loading technology used in Emacs, if required. It is not
a given that this value will be the same as the Emacs version number.
*/ );
- Vmodule_version = build_string (EMODULES_VERSION);
+ Vmodule_version = build_cistring (EMODULES_VERSION);
DEFVAR_BOOL ("load-modules-quietly", &load_modules_quietly /*
*Set to t if module loading is to be silent.
diff -r 19a72041c5ed -r 304aebb79cd3 src/event-Xt.c
--- a/src/event-Xt.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/event-Xt.c Wed Jan 27 00:35:36 2010 -0600
@@ -192,7 +192,7 @@
EQ (new_value, Qt)))
{
maybe_define_x_key_as_self_inserting_character (keysym, sym);
- Fputhash (build_ext_string (name, Qbinary), new_value,
+ Fputhash (build_extstring (name, Qbinary), new_value,
hash_table);
Fputhash (sym, new_value, hash_table);
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/event-gtk.c
--- a/src/event-gtk.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/event-gtk.c Wed Jan 27 00:35:36 2010 -0600
@@ -228,7 +228,7 @@
{
Lisp_Object console = CDFW_CONSOLE (EVENT_CHANNEL (emacs_event));
if (CONSOLE_GTK_P (XCONSOLE (console)))
- write_c_string
+ write_cistring
(pstream,
gtk_event_name (EVENT_MAGIC_GDK_EVENT (emacs_event).type));
}
@@ -1021,7 +1021,7 @@
l_type = Qdragdrop_MIME;
l_dndlist = list1 (list3 (list1 (build_ascstring ("text/plain")),
build_ascstring ("8_bit"),
- make_ext_string (data->data,
+ make_extstring (data->data,
strlen ((char *)data->data),
Qctext)));
}
@@ -1048,9 +1048,9 @@
We just pass it up to lisp - we already have a mime type.
*/
l_type = Qdragdrop_MIME;
- l_dndlist = list1 (list3 (list1 (build_string (gdk_atom_name (data->type))),
+ l_dndlist = list1 (list3 (list1 (build_cistring (gdk_atom_name (data->type))),
build_ascstring ("8bit"),
- make_ext_string ((Extbyte *) data->data,
+ make_extstring ((Extbyte *) data->data,
data->length, Qbinary)));
}
@@ -1787,7 +1787,7 @@
Lisp_Object sym = gtk_keysym_to_emacs_keysym (keysym[0], 0);
if (name)
{
- Fputhash (build_ext_string (name, Qx_keysym_encoding),
+ Fputhash (build_extstring (name, Qx_keysym_encoding),
Qsans_modifiers, hashtable);
Fputhash (sym, Qsans_modifiers, hashtable);
}
@@ -1802,7 +1802,7 @@
Lisp_Object sym = gtk_keysym_to_emacs_keysym (keysym[j], 0);
if (name && NILP (Fgethash (sym, hashtable, Qnil)))
{
- Fputhash (build_ext_string (name, Qx_keysym_encoding),
+ Fputhash (build_extstring (name, Qx_keysym_encoding),
Qt, hashtable);
Fputhash (sym, Qt, hashtable);
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/event-msw.c
--- a/src/event-msw.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/event-msw.c Wed Jan 27 00:35:36 2010 -0600
@@ -2118,7 +2118,7 @@
they don't allow relative paths at all! this is way bogus. */
cmd = urlify_filename (cmd);
- l_dndlist = build_intstring (cmd);
+ l_dndlist = build_istring (cmd);
xfree (cmd, Ibyte *);
}
GCPRO2 (emacs_event, l_dndlist);
@@ -3735,7 +3735,7 @@
{
Ibyte *fname2 = urlify_filename (fname);
- l_item = build_intstring (fname2);
+ l_item = build_istring (fname2);
xfree (fname2, Ibyte *);
if (freeme)
xfree (fname, Ibyte *);
diff -r 19a72041c5ed -r 304aebb79cd3 src/faces.c
--- a/src/faces.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/faces.c Wed Jan 27 00:35:36 2010 -0600
@@ -2335,7 +2335,7 @@
#ifdef USE_XFT
for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
inst_list = Fcons (Fcons (list1 (device_symbol),
- build_string (*fontptr)),
+ build_cistring (*fontptr)),
inst_list);
#else /* !USE_XFT */
@@ -2378,7 +2378,7 @@
for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
inst_list = Fcons (Fcons (list3 (device_symbol,
Qtwo_dimensional, Qinitial),
- build_string (*fontptr)),
+ build_cistring (*fontptr)),
inst_list);
/* We need to set the font for the JIT-ucs-charsets separately from the
diff -r 19a72041c5ed -r 304aebb79cd3 src/file-coding.c
--- a/src/file-coding.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/file-coding.c Wed Jan 27 00:35:36 2010 -0600
@@ -673,7 +673,7 @@
}
}
- coding_system_or_name = intern_int (eidata (desired_base));
+ coding_system_or_name = intern_istring (eidata (desired_base));
/* Remove this coding system and its subsidiary coding
systems from the hash, to avoid calling this code recursively. */
@@ -1101,14 +1101,14 @@
enum eol_type eol = coding_subsidiary_list[i].eol;
qxestrcpy_ascii (codesys_name + len, extension);
- codesys_name_sym = intern_int (codesys_name);
+ codesys_name_sym = intern_istring (codesys_name);
if (mlen != -1)
qxestrcpy_ascii (codesys_mnemonic + mlen, mnemonic_ext);
sub_codesys = Fcopy_coding_system (codesys, codesys_name_sym);
if (mlen != -1)
XCODING_SYSTEM_MNEMONIC (sub_codesys) =
- build_intstring (codesys_mnemonic);
+ build_istring (codesys_mnemonic);
if (eol != EOL_LF)
{
@@ -1121,7 +1121,7 @@
(sub_codesys, "internal-subsidiary-eol-wrapper",
Qchain, Qunbound,
mlen != -1 ?
- list6 (Qmnemonic, build_intstring (codesys_mnemonic),
+ list6 (Qmnemonic, build_istring (codesys_mnemonic),
Qchain, chain,
Qcanonicalize_after_coding, sub_codesys) :
list4 (Qchain, chain,
@@ -1207,7 +1207,7 @@
XSTRING_DATA (Fsymbol_name (XCODING_SYSTEM_NAME
(name_or_existing))),
++coding_system_tick);
- name_or_existing = intern_int (newname);
+ name_or_existing = intern_istring (newname);
xfree (newname, Ibyte *);
if (UNBOUNDP (description))
@@ -1216,12 +1216,12 @@
emacs_sprintf_malloc
(NULL, "For Internal Use (%s)",
XSTRING_DATA (Fsymbol_name (name_or_existing)));
- description = build_intstring (newname);
+ description = build_istring (newname);
xfree (newname, Ibyte *);
}
newname = emacs_sprintf_malloc (NULL, "Int%d", coding_system_tick);
- defmnem = build_intstring (newname);
+ defmnem = build_istring (newname);
xfree (newname, Ibyte *);
}
else
@@ -1370,7 +1370,7 @@
(NULL, "internal-eol-copy-%s-%d",
XSTRING_DATA (Fsymbol_name (name_or_existing)),
++coding_system_tick);
- Lisp_Object newnamesym = intern_int (newname);
+ Lisp_Object newnamesym = intern_istring (newname);
Lisp_Object copied = Fcopy_coding_system (csobj, newnamesym);
xfree (newname, Ibyte *);
@@ -3713,9 +3713,9 @@
if (n > 0)
{
name[n] = '\0';
- /* This call to intern_int() is OK because we already verified that
+ /* This call to intern_istring() is OK because we already verified that
there are only ASCII characters in the string */
- return find_coding_system_for_text_file (intern_int ((Ibyte *) name), 0);
+ return find_coding_system_for_text_file (intern_istring ((Ibyte *) name), 0);
}
return Qnil;
diff -r 19a72041c5ed -r 304aebb79cd3 src/fileio.c
--- a/src/fileio.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/fileio.c Wed Jan 27 00:35:36 2010 -0600
@@ -182,9 +182,9 @@
{
Ibyte ffff[99];
qxesprintf (ffff, "Unknown error %d", errnum);
- return build_intstring (ffff);
- }
- return build_ext_string (ret, Qstrerror_encoding);
+ return build_istring (ffff);
+ }
+ return build_extstring (ret, Qstrerror_encoding);
}
static Lisp_Object
@@ -429,7 +429,7 @@
qxestrncpy (newbeg, beg, len);
newbeg[len] = '\0';
newbeg = mswindows_canonicalize_filename (newbeg);
- return build_intstring (newbeg);
+ return build_istring (newbeg);
}
#endif
#endif /* not WIN32_NATIVE */
@@ -549,7 +549,7 @@
buf = alloca_ibytes (XSTRING_LENGTH (filename) + 10);
file_name_as_directory (buf, XSTRING_DATA (filename));
if (qxestrcmp (buf, XSTRING_DATA (filename)))
- return build_intstring (buf);
+ return build_istring (buf);
else
return filename;
}
@@ -606,7 +606,7 @@
return call2_check_string (handler, Qdirectory_file_name, directory);
buf = alloca_ibytes (XSTRING_LENGTH (directory) + 20);
directory_file_name (XSTRING_DATA (directory), buf);
- return build_intstring (buf);
+ return build_istring (buf);
}
/* Fmake_temp_name used to be a simple wrapper around mktemp(), but it
@@ -946,7 +946,7 @@
{
newnm = mswindows_canonicalize_filename (nm);
if (qxestrcmp (newnm, XSTRING_DATA (name)) != 0)
- name = build_intstring (newnm);
+ name = build_istring (newnm);
}
else
{
@@ -954,7 +954,7 @@
newnm = mswindows_canonicalize_filename (nm - 2);
if (qxestrcmp (newnm, XSTRING_DATA (name)) != 0)
{
- name = build_intstring (newnm);
+ name = build_istring (newnm);
XSTRING_DATA (name)[0] = DRIVE_LETTER (drive);
XSTRING_DATA (name)[1] = ':';
}
@@ -967,7 +967,7 @@
if (nm == XSTRING_DATA (name))
RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, name);
RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name,
- build_intstring (nm));
+ build_istring (nm));
#endif /* not WIN32_NATIVE */
}
}
@@ -1332,7 +1332,7 @@
{
Ibyte *newtarget = mswindows_canonicalize_filename (target);
- Lisp_Object result = build_intstring (newtarget);
+ Lisp_Object result = build_istring (newtarget);
xfree (newtarget, Ibyte *);
RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, result);
@@ -2607,7 +2607,7 @@
if (!fname)
return Qnil;
{
- Lisp_Object val = build_intstring (fname);
+ Lisp_Object val = build_istring (fname);
xfree (fname, Ibyte *);
return val;
}
@@ -3858,7 +3858,7 @@
ecb_crypt (raw_key, encrypted_string, rounded_size,
DES_ENCRYPT | DES_SW);
- return make_ext_string (encrypted_string, rounded_size, Qbinary);
+ return make_extstring (encrypted_string, rounded_size, Qbinary);
}
DEFUN ("decrypt-string", Fdecrypt_string, 2, 2, 0, /*
@@ -3889,7 +3889,7 @@
ecb_crypt (raw_key, decrypted_string, string_size, D | DES_SW);
- return make_ext_string (decrypted_string, string_size - 1, Qbinary);
+ return make_extstring (decrypted_string, string_size - 1, Qbinary);
}
#endif /* 0 */
diff -r 19a72041c5ed -r 304aebb79cd3 src/filelock.c
--- a/src/filelock.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/filelock.c Wed Jan 27 00:35:36 2010 -0600
@@ -358,7 +358,7 @@
attack = call2_in_buffer (BUFFERP (subject_buf) ? XBUFFER (subject_buf) :
current_buffer, Qask_user_about_lock , fn,
- build_intstring (locker));
+ build_istring (locker));
if (!NILP (attack) && current_buffer == XBUFFER (old_current_buffer))
/* User says take the lock */
{
@@ -474,7 +474,7 @@
else if (owner == 2)
ret = Qt;
else
- ret = build_intstring (locker.user);
+ ret = build_istring (locker.user);
if (owner > 0)
FREE_LOCK_INFO (locker);
diff -r 19a72041c5ed -r 304aebb79cd3 src/floatfns.c
--- a/src/floatfns.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/floatfns.c Wed Jan 27 00:35:36 2010 -0600
@@ -2453,7 +2453,7 @@
/* if (!strcmp (x->name, "pow")) x->name = "expt"; */
- args = Fcons (build_ext_string (x->name, Qerror_message_encoding),
+ args = Fcons (build_extstring (x->name, Qerror_message_encoding),
Fcons (make_float (x->arg1),
((in_float == 2)
? Fcons (make_float (x->arg2), Qnil)
diff -r 19a72041c5ed -r 304aebb79cd3 src/font-mgr.c
--- a/src/font-mgr.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/font-mgr.c Wed Jan 27 00:35:36 2010 -0600
@@ -162,7 +162,7 @@
(NEW_LISP_STRING_TO_EXTERNAL ((str), Qfc_font_name_encoding))
#define build_fcapi_string(str) \
- (build_ext_string ((Extbyte *) (str), Qfc_font_name_encoding))
+ (build_extstring ((Extbyte *) (str), Qfc_font_name_encoding))
/* #### This homebrew lashup should be replaced with FcConstants.
@@ -1217,7 +1217,7 @@
unsigned i;
Lisp_Object reg = Qnil;
const Extbyte *re[] = /* #### This could just be catenated by
- cpp and passed to build_ext_string. */
+ cpp and passed to build_extstring. */
{
/* Regular expression matching XLFDs as defined by XLFD v. 1.5.
Matches must be case-insensitive.
@@ -1264,7 +1264,7 @@
for (i = 0; i < sizeof(re)/sizeof(Extbyte *); i++)
{
/* #### Currently this is Host Portable Coding, not ISO 8859-1. */
- reg = concat2(reg, build_ext_string (re[i], Qx_font_name_encoding));
+ reg = concat2(reg, build_extstring (re[i], Qx_font_name_encoding));
}
RETURN_UNGCPRO (reg);
diff -r 19a72041c5ed -r 304aebb79cd3 src/frame-msw.c
--- a/src/frame-msw.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/frame-msw.c Wed Jan 27 00:35:36 2010 -0600
@@ -607,7 +607,7 @@
struct frame *f = decode_mswindows_frame (frame);
qxesprintf (str, "%lu", (unsigned long) FRAME_MSWINDOWS_HANDLE (f));
- return build_intstring (str);
+ return build_istring (str);
}
static Lisp_Object
diff -r 19a72041c5ed -r 304aebb79cd3 src/frame-x.c
--- a/src/frame-x.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/frame-x.c Wed Jan 27 00:35:36 2010 -0600
@@ -515,7 +515,7 @@
color.pixel = pixel;
XQueryColor (XtDisplay (w), w->core.colormap, &color);
qxesprintf (buf, "#%04x%04x%04x", color.red, color.green, color.blue);
- return build_intstring (buf);
+ return build_istring (buf);
}
static void
@@ -990,9 +990,9 @@
shell->core.widget_class->core_class.class_name,
resources, XtNumber (resources), 0, 0);
if (results[0])
- Vframe_title_format = build_ext_string (results[0], Qctext);
+ Vframe_title_format = build_extstring (results[0], Qctext);
if (results[1])
- Vframe_icon_title_format = build_ext_string (results[1], Qctext);
+ Vframe_icon_title_format = build_extstring (results[1], Qctext);
}
frame_title_format_already_set = 1;
@@ -1274,7 +1274,7 @@
fileint, Qfile_name);
hurl = dnd_url_hexify_string (fileint, "file:");
- l_data = Fcons (build_intstring (hurl), l_data);
+ l_data = Fcons (build_istring (hurl), l_data);
xfree (hurl, Ibyte *);
}
}
@@ -1297,12 +1297,12 @@
/* let us forget this name thing for now... */
/* filePath = transferInfo->dropData->data.buffers[ii].name;
path = (filePath == NULL) ? Qnil
- : build_ext_string (filePath, Q???); */
+ : build_extstring (filePath, Q???); */
/* what, if the data is no text, and how can I tell it? */
l_data =
Fcons (list3 (list1 (build_ascstring ("text/plain")),
build_ascstring ("8bit"),
- make_ext_string
+ make_extstring
(transferInfo->dropData->data.buffers[ii].bp,
transferInfo->dropData->data.buffers[ii].size,
/* !!#### what goes here? */
@@ -2208,7 +2208,7 @@
struct frame *f = decode_x_frame (frame);
qxesprintf (str, "%lu", XtWindow (FRAME_X_TEXT_WIDGET (f)));
- return build_intstring (str);
+ return build_istring (str);
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/glade.c
--- a/src/glade.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/glade.c Wed Jan 27 00:35:36 2010 -0600
@@ -59,7 +59,7 @@
if (signal_data && signal_data[0])
{
lisp_data
- = IGNORE_MULTIPLE_VALUES (Feval (Fread (build_string (signal_data))));
+ = IGNORE_MULTIPLE_VALUES (Feval (Fread (build_cistring (signal_data))));
}
/* obj, name, func, cb_data, object_signal, after_p */
@@ -132,7 +132,7 @@
#else
the_domain = GLADE_XML (XGTK_OBJECT (xml)->object)->textdomain;
#endif
- return (build_string (the_domain));
+ return (build_cistring (the_domain));
}
void syms_of_glade (void)
diff -r 19a72041c5ed -r 304aebb79cd3 src/glyphs-eimage.c
--- a/src/glyphs-eimage.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/glyphs-eimage.c Wed Jan 27 00:35:36 2010 -0600
@@ -375,7 +375,7 @@
/* Create the message */
(*cinfo.err->format_message) ((j_common_ptr) &cinfo, buffer);
- errstring = build_ext_string (buffer, Qjpeg_error_message_encoding);
+ errstring = build_extstring (buffer, Qjpeg_error_message_encoding);
signal_image_error_2 ("JPEG decoding error",
errstring, instantiator);
@@ -902,7 +902,7 @@
/* Something blew up:
just display the error (cleanup happens in the unwind) */
signal_image_error_2 ("Error decoding PNG",
- build_ext_string (png_err_stct.err_str,
+ build_extstring (png_err_stct.err_str,
Qerror_message_encoding),
instantiator);
}
@@ -1301,7 +1301,7 @@
/* An error was signaled. No clean up is needed, as unwind handles that
for us. Just pass the error along. */
signal_image_error_2 ("TIFF decoding error",
- build_ext_string (tiff_err_data.err_str,
+ build_extstring (tiff_err_data.err_str,
Qerror_message_encoding),
instantiator);
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/glyphs-gtk.c
--- a/src/glyphs-gtk.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/glyphs-gtk.c Wed Jan 27 00:35:36 2010 -0600
@@ -1775,7 +1775,7 @@
source = gdk_font_load (source_name);
if (! source)
gui_error_2 ("couldn't load font",
- build_string (source_name),
+ build_cistring (source_name),
data);
if (count == 2)
mask = 0;
@@ -1787,7 +1787,7 @@
if (!mask)
/* continuable */
Fsignal (Qgui_error, list3 (build_msg_string ("couldn't load font"),
- build_string (mask_name), data));
+ build_cistring (mask_name), data));
}
if (!mask)
mask_char = 0;
@@ -2941,7 +2941,7 @@
vector3 (Qxbm, Q_data, \
list3 (make_int (name##_width), \
make_int (name##_height), \
- make_ext_string ((Extbyte*) name##_bits, \
+ make_extstring ((Extbyte*) name##_bits, \
sizeof (name##_bits), \
Qbinary))), \
Qglobal, Qgtk, Qnil)
diff -r 19a72041c5ed -r 304aebb79cd3 src/glyphs-x.c
--- a/src/glyphs-x.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/glyphs-x.c Wed Jan 27 00:35:36 2010 -0600
@@ -602,7 +602,7 @@
(pathext = XtResolvePathname (display, "bitmaps", 0, 0, pathext,
subs, XtNumber (subs), 0)))
{
- name = build_ext_string (pathext, Qfile_name);
+ name = build_extstring (pathext, Qfile_name);
XtFree (pathext);
return (name);
}
@@ -1923,7 +1923,7 @@
source = safe_XLoadFont (dpy, source_name);
if (! source)
signal_error_2 (Qgui_error,
- "couldn't load font", build_intstring (source_name), data);
+ "couldn't load font", build_istring (source_name), data);
if (count == 2)
mask = 0;
else if (!mask_name[0])
@@ -1934,7 +1934,7 @@
if (!mask)
signal_continuable_error_2 (Qgui_error,
"couldn't load font",
- build_intstring (mask_name), data);
+ build_istring (mask_name), data);
}
if (!mask)
mask_char = 0;
@@ -2561,7 +2561,7 @@
if (EQ (prop, Q_text))
{
widget_value* wv = lw_get_all_values (IMAGE_INSTANCE_X_WIDGET_LWID (ii));
- return build_ext_string (wv->value, Qlwlib_encoding);
+ return build_extstring (wv->value, Qlwlib_encoding);
}
return Qunbound;
}
@@ -3013,7 +3013,7 @@
vector3 (Qxbm, Q_data, \
list3 (make_int (name##_width), \
make_int (name##_height), \
- make_ext_string ((Extbyte *) name##_bits, \
+ make_extstring ((Extbyte *) name##_bits, \
sizeof (name##_bits), \
Qbinary))), \
Qglobal, Qx, Qnil)
diff -r 19a72041c5ed -r 304aebb79cd3 src/glyphs.c
--- a/src/glyphs.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/glyphs.c Wed Jan 27 00:35:36 2010 -0600
@@ -1016,7 +1016,7 @@
Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii);
s = qxestrrchr (XSTRING_DATA (filename), '/');
if (s)
- print_internal (build_intstring (s + 1), printcharfun, 1);
+ print_internal (build_istring (s + 1), printcharfun, 1);
else
print_internal (filename, printcharfun, 1);
}
@@ -2696,7 +2696,7 @@
int len = (w + 7) / 8 * h;
retval = list3 (make_int (w), make_int (h),
- make_ext_string ((Extbyte *) data, len, Qbinary));
+ make_extstring ((Extbyte *) data, len, Qbinary));
XFree (data);
return retval;
}
@@ -2970,19 +2970,19 @@
set_buffer_internal (XBUFFER (temp_buffer));
Ferase_buffer (Qnil);
- buffer_insert_c_string (current_buffer, "/* XPM */\r");
- buffer_insert_c_string (current_buffer, "static char *pixmap[] = {\r");
+ buffer_insert_ascstring (current_buffer, "/* XPM */\r");
+ buffer_insert_ascstring (current_buffer, "static char *pixmap[] = {\r");
sscanf (data[0], "%d %d %d", &height, &width, &ncolors);
for (elt = 0; elt <= width + ncolors; elt++)
{
- buffer_insert_c_string (current_buffer, "\"");
- buffer_insert_c_string (current_buffer, data[elt]);
+ buffer_insert_ascstring (current_buffer, "\"");
+ buffer_insert_ascstring (current_buffer, data[elt]);
if (elt < width + ncolors)
- buffer_insert_c_string (current_buffer, "\",\r");
- else
- buffer_insert_c_string (current_buffer, "\"};\r");
+ buffer_insert_ascstring (current_buffer, "\",\r");
+ else
+ buffer_insert_ascstring (current_buffer, "\"};\r");
}
retval = Fbuffer_substring (Qnil, Qnil, Qnil);
diff -r 19a72041c5ed -r 304aebb79cd3 src/gpmevent.c
--- a/src/gpmevent.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/gpmevent.c Wed Jan 27 00:35:36 2010 -0600
@@ -186,7 +186,7 @@
static void turn_off_gpm (char *process_name)
{
- Lisp_Object process = Fget_process (build_string (process_name));
+ Lisp_Object process = Fget_process (build_cistring (process_name));
int fd = -1;
if (NILP (process))
@@ -201,7 +201,7 @@
clear_gpm_state (fd);
- Fdelete_process (build_string (process_name));
+ Fdelete_process (build_cistring (process_name));
}
#ifdef TIOCLINUX
@@ -493,7 +493,7 @@
snprintf (process_name, sizeof(process_name) - 1, "gpm for %s",
console_name);
- proc = Fget_process (build_string (process_name));
+ proc = Fget_process (build_cistring (process_name));
if (NILP (proc))
return (Qnil);
@@ -585,7 +585,7 @@
set_descriptor_non_blocking (gpm_fd);
store_gpm_state (gpm_fd);
gpm_process =
- connect_to_file_descriptor (build_string (process_name), Qnil,
+ connect_to_file_descriptor (build_cistring (process_name), Qnil,
make_int (gpm_fd),
make_int (gpm_fd));
diff -r 19a72041c5ed -r 304aebb79cd3 src/gtk-glue.c
--- a/src/gtk-glue.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/gtk-glue.c Wed Jan 27 00:35:36 2010 -0600
@@ -128,7 +128,7 @@
{
Lisp_Object *rv = (Lisp_Object *) user_data;
- *rv = Fcons (build_string ((char *)data), *rv);
+ *rv = Fcons (build_cistring ((char *)data), *rv);
}
static Lisp_Object
diff -r 19a72041c5ed -r 304aebb79cd3 src/gtk-xemacs.c
--- a/src/gtk-xemacs.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/gtk-xemacs.c Wed Jan 27 00:35:36 2010 -0600
@@ -179,7 +179,7 @@
if (style->rc_style && style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]) \
{ \
FROB (Vdefault_face, Qbackground_pixmap, \
- Fmake_image_instance (build_string (style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]), \
+ Fmake_image_instance (build_cistring (style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]), \
f->device, Qnil, make_int (5))); \
} \
else \
@@ -437,5 +437,5 @@
sprintf (color_buf, "#%04x%04x%04x", c->red, c->green, c->blue);
- return (build_string (color_buf));
+ return (build_cistring (color_buf));
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/hpplay.c
--- a/src/hpplay.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/hpplay.c Wed Jan 27 00:35:36 2010 -0600
@@ -75,7 +75,7 @@
AGetErrorText (audio, errorCode, errorbuff, 131);
EXTERNAL_TO_C_STRING (errorbuf, interr, Qerror_message_encoding);
- signal_error (Qsound_error, text, build_intstring (interr));
+ signal_error (Qsound_error, text, build_istring (interr));
}
long
diff -r 19a72041c5ed -r 304aebb79cd3 src/insdel.c
--- a/src/insdel.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/insdel.c Wed Jan 27 00:35:36 2010 -0600
@@ -1305,11 +1305,12 @@
/* Insert the null-terminated string S (in external format). */
Charcount
-buffer_insert_c_string_1 (struct buffer *buf, Charbpos pos, const char *s,
+buffer_insert_ascstring_1 (struct buffer *buf, Charbpos pos, const Ascbyte *s,
int flags)
{
/* This function can GC */
- const char *translated = GETTEXT (s);
+ const CIbyte *translated = GETTEXT (s);
+ ASSERT_ASCTEXT_ASCII (s);
return buffer_insert_string_1 (buf, pos, (const Ibyte *) translated, Qnil,
0, strlen (translated), flags);
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/insdel.h
--- a/src/insdel.h Tue Jan 26 23:22:30 2010 -0600
+++ b/src/insdel.h Wed Jan 27 00:35:36 2010 -0600
@@ -46,8 +46,8 @@
Bytecount length, int flags);
Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Charbpos pos,
Lisp_Object str, int flags);
-Charcount buffer_insert_c_string_1 (struct buffer *buf, Charbpos pos,
- const char *s, int flags);
+Charcount buffer_insert_ascstring_1 (struct buffer *buf, Charbpos pos,
+ const Ascbyte *s, int flags);
Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos,
Ichar ch, int flags);
Charcount buffer_insert_c_char_1 (struct buffer *buf, Charbpos pos, char c,
@@ -63,8 +63,8 @@
buffer_insert_string_1 (buf, -1, nonreloc, reloc, offset, length, 0)
#define buffer_insert_raw_string(buf, string, length) \
buffer_insert_raw_string_1 (buf, -1, string, length, 0)
-#define buffer_insert_c_string(buf, s) \
- buffer_insert_c_string_1 (buf, -1, s, 0)
+#define buffer_insert_ascstring(buf, s) \
+ buffer_insert_ascstring_1 (buf, -1, s, 0)
#define buffer_insert_lisp_string(buf, str) \
buffer_insert_lisp_string_1 (buf, -1, str, 0)
#define buffer_insert_c_char(buf, c) \
diff -r 19a72041c5ed -r 304aebb79cd3 src/intl.c
--- a/src/intl.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/intl.c Wed Jan 27 00:35:36 2010 -0600
@@ -49,7 +49,7 @@
loc = setlocale (LC_CTYPE, NULL);
if (!loc)
return Qnil;
- return build_ext_string (loc, Qctext);
+ return build_extstring (loc, Qctext);
}
DEFUN ("set-current-locale", Fset_current_locale, 1, 1, 0, /*
@@ -92,7 +92,7 @@
}
#endif
- str = build_ext_string (loc, Qctext);
+ str = build_extstring (loc, Qctext);
xfree (loc, Extbyte *);
return str;
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/keymap.c
--- a/src/keymap.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/keymap.c Wed Jan 27 00:35:36 2010 -0600
@@ -474,7 +474,7 @@
Ibyte str [1 + MAX_ICHAR_LEN];
Bytecount count = set_itext_ichar (str, XCHAR (keysym));
str[count] = 0;
- keysym = intern_int (str);
+ keysym = intern_istring (str);
}
return control_meta_superify (keysym, modifiers);
}
@@ -3655,7 +3655,7 @@
}
*p = 0;
- return build_intstring (buf);
+ return build_istring (buf);
}
@@ -4150,7 +4150,7 @@
Findent_to (make_int (16), make_int (3), buffer);
if (keymapp)
- buffer_insert_c_string (XBUFFER (buffer), "<< ");
+ buffer_insert_ascstring (XBUFFER (buffer), "<< ");
if (SYMBOLP (definition))
{
@@ -4158,19 +4158,19 @@
}
else if (STRINGP (definition) || VECTORP (definition))
{
- buffer_insert_c_string (XBUFFER (buffer), "Kbd Macro: ");
+ buffer_insert_ascstring (XBUFFER (buffer), "Kbd Macro: ");
buffer_insert1 (XBUFFER (buffer), Fkey_description (definition));
}
else if (COMPILED_FUNCTIONP (definition))
- buffer_insert_c_string (XBUFFER (buffer), "Anonymous Compiled Function");
+ buffer_insert_ascstring (XBUFFER (buffer), "Anonymous Compiled Function");
else if (CONSP (definition) && EQ (XCAR (definition), Qlambda))
- buffer_insert_c_string (XBUFFER (buffer), "Anonymous Lambda");
+ buffer_insert_ascstring (XBUFFER (buffer), "Anonymous Lambda");
else if (KEYMAPP (definition))
{
Lisp_Object name = XKEYMAP (definition)->name;
if (STRINGP (name) || (SYMBOLP (name) && !NILP (name)))
{
- buffer_insert_c_string (XBUFFER (buffer), "Prefix command ");
+ buffer_insert_ascstring (XBUFFER (buffer), "Prefix command ");
if (SYMBOLP (name)
&& EQ (find_symbol_value (name), definition))
buffer_insert1 (XBUFFER (buffer), Fsymbol_name (name));
@@ -4180,14 +4180,14 @@
}
}
else
- buffer_insert_c_string (XBUFFER (buffer), "Prefix Command");
- }
- else
- buffer_insert_c_string (XBUFFER (buffer), "??");
+ buffer_insert_ascstring (XBUFFER (buffer), "Prefix Command");
+ }
+ else
+ buffer_insert_ascstring (XBUFFER (buffer), "??");
if (keymapp)
- buffer_insert_c_string (XBUFFER (buffer), " >>");
- buffer_insert_c_string (XBUFFER (buffer), "\n");
+ buffer_insert_ascstring (XBUFFER (buffer), " >>");
+ buffer_insert_ascstring (XBUFFER (buffer), "\n");
UNGCPRO;
}
@@ -4470,7 +4470,7 @@
if (!NILP (list))
{
list = list_sort (list, Qnil, describe_map_sort_predicate);
- buffer_insert_c_string (buf, "\n");
+ buffer_insert_ascstring (buf, "\n");
while (!NILP (list))
{
Lisp_Object elt = XCAR (XCAR (list));
@@ -4481,17 +4481,17 @@
buffer_insert_lisp_string (buf, elt_prefix);
if (modifiers & XEMACS_MOD_META)
- buffer_insert_c_string (buf, "M-");
+ buffer_insert_ascstring (buf, "M-");
if (modifiers & XEMACS_MOD_CONTROL)
- buffer_insert_c_string (buf, "C-");
+ buffer_insert_ascstring (buf, "C-");
if (modifiers & XEMACS_MOD_SUPER)
- buffer_insert_c_string (buf, "S-");
+ buffer_insert_ascstring (buf, "S-");
if (modifiers & XEMACS_MOD_HYPER)
- buffer_insert_c_string (buf, "H-");
+ buffer_insert_ascstring (buf, "H-");
if (modifiers & XEMACS_MOD_ALT)
- buffer_insert_c_string (buf, "Alt-");
+ buffer_insert_ascstring (buf, "Alt-");
if (modifiers & XEMACS_MOD_SHIFT)
- buffer_insert_c_string (buf, "Sh-");
+ buffer_insert_ascstring (buf, "Sh-");
if (SYMBOLP (keysym))
{
Lisp_Object code = Fget (keysym, Qcharacter_of_keysym, Qnil);
@@ -4500,19 +4500,19 @@
/* Calling Fsingle_key_description() would cons more */
#if 0 /* This is bogus */
if (EQ (keysym, QKlinefeed))
- buffer_insert_c_string (buf, "LFD");
+ buffer_insert_ascstring (buf, "LFD");
else if (EQ (keysym, QKtab))
- buffer_insert_c_string (buf, "TAB");
+ buffer_insert_ascstring (buf, "TAB");
else if (EQ (keysym, QKreturn))
- buffer_insert_c_string (buf, "RET");
+ buffer_insert_ascstring (buf, "RET");
else if (EQ (keysym, QKescape))
- buffer_insert_c_string (buf, "ESC");
+ buffer_insert_ascstring (buf, "ESC");
else if (EQ (keysym, QKdelete))
- buffer_insert_c_string (buf, "DEL");
+ buffer_insert_ascstring (buf, "DEL");
else if (EQ (keysym, QKspace))
- buffer_insert_c_string (buf, "SPC");
+ buffer_insert_ascstring (buf, "SPC");
else if (EQ (keysym, QKbackspace))
- buffer_insert_c_string (buf, "BS");
+ buffer_insert_ascstring (buf, "BS");
else
#endif
if (c >= printable_min)
@@ -4522,7 +4522,7 @@
else if (CHARP (keysym))
buffer_insert_emacs_char (buf, XCHAR (keysym));
else
- buffer_insert_c_string (buf, "---bad keysym---");
+ buffer_insert_ascstring (buf, "---bad keysym---");
if (elided)
elided = 0;
@@ -4538,9 +4538,9 @@
if (k != 0)
{
if (k == 1)
- buffer_insert_c_string (buf, ", ");
+ buffer_insert_ascstring (buf, ", ");
else
- buffer_insert_c_string (buf, " .. ");
+ buffer_insert_ascstring (buf, " .. ");
elided = 1;
continue;
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/lisp.h
--- a/src/lisp.h Tue Jan 26 23:22:30 2010 -0600
+++ b/src/lisp.h Wed Jan 27 00:35:36 2010 -0600
@@ -4358,12 +4358,12 @@
int c_readonly (Lisp_Object);
int lisp_readonly (Lisp_Object);
MODULE_API void copy_lisp_object (Lisp_Object dst, Lisp_Object src);
-MODULE_API Lisp_Object build_intstring (const Ibyte *);
-MODULE_API Lisp_Object build_string (const CIbyte *);
+MODULE_API Lisp_Object build_istring (const Ibyte *);
+MODULE_API Lisp_Object build_cistring (const CIbyte *);
MODULE_API Lisp_Object build_ascstring (const Ascbyte *);
-MODULE_API Lisp_Object build_ext_string (const Extbyte *, Lisp_Object);
+MODULE_API Lisp_Object build_extstring (const Extbyte *, Lisp_Object);
MODULE_API Lisp_Object make_string (const Ibyte *, Bytecount);
-MODULE_API Lisp_Object make_ext_string (const Extbyte *, EMACS_INT, Lisp_Object);
+MODULE_API Lisp_Object make_extstring (const Extbyte *, EMACS_INT, Lisp_Object);
void init_string_ascii_begin (Lisp_Object string);
Lisp_Object make_uninit_string (Bytecount);
MODULE_API Lisp_Object make_float (double);
@@ -5388,7 +5388,7 @@
* (eg Qnil means stdout, not Vstandard_output, etc) */
MODULE_API void write_istring (Lisp_Object stream, const Ibyte *str);
/* Same goes for this function. */
-MODULE_API void write_c_string (Lisp_Object stream, const CIbyte *str);
+MODULE_API void write_cistring (Lisp_Object stream, const CIbyte *str);
/* Same goes for this function. */
MODULE_API void write_ascstring (Lisp_Object stream, const Ascbyte *str);
/* Same goes for this function. */
@@ -5528,7 +5528,7 @@
EXFUN (Fsymbol_value, 1);
unsigned int hash_string (const Ibyte *, Bytecount);
-Lisp_Object intern_int (const Ibyte *str);
+Lisp_Object intern_istring (const Ibyte *str);
MODULE_API Lisp_Object intern (const CIbyte *str);
Lisp_Object intern_converting_underscores_to_dashes (const CIbyte *str);
Lisp_Object oblookup (Lisp_Object, const Ibyte *, Bytecount);
diff -r 19a72041c5ed -r 304aebb79cd3 src/lread.c
--- a/src/lread.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/lread.c Wed Jan 27 00:35:36 2010 -0600
@@ -1097,7 +1097,7 @@
{
/* We succeeded; return this descriptor and filename. */
if (closure->storeptr)
- *closure->storeptr = build_intstring (fn);
+ *closure->storeptr = build_istring (fn);
return 1;
}
@@ -1181,7 +1181,7 @@
locate_file_construct_suffixed_files_mapper (Ibyte *fn, void *arg)
{
Lisp_Object *tail = (Lisp_Object *) arg;
- *tail = Fcons (build_intstring (fn), *tail);
+ *tail = Fcons (build_istring (fn), *tail);
return 0;
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/mule-charset.c
--- a/src/mule-charset.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/mule-charset.c Wed Jan 27 00:35:36 2010 -0600
@@ -625,7 +625,7 @@
Ibyte tempname[80];
qxesprintf (tempname, "___temporary___%d__", id);
- name = Fmake_symbol (build_intstring (tempname)); /* Uninterned. */
+ name = Fmake_symbol (build_istring (tempname)); /* Uninterned. */
}
if (NILP (doc_string))
doc_string = build_ascstring ("");
diff -r 19a72041c5ed -r 304aebb79cd3 src/nt.c
--- a/src/nt.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/nt.c Wed Jan 27 00:35:36 2010 -0600
@@ -2109,7 +2109,7 @@
TSTR_TO_C_STRING (shortname, shortint);
MSWINDOWS_NORMALIZE_FILENAME (shortint);
- return build_intstring (shortint);
+ return build_istring (shortint);
}
@@ -2132,7 +2132,7 @@
return Qnil;
canon = mswindows_canonicalize_filename (longname);
- ret = build_intstring (canon);
+ ret = build_istring (canon);
xfree (canon, Ibyte *);
xfree (longname, Ibyte *);
return ret;
diff -r 19a72041c5ed -r 304aebb79cd3 src/objects-gtk.c
--- a/src/objects-gtk.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/objects-gtk.c Wed Jan 27 00:35:36 2010 -0600
@@ -472,7 +472,7 @@
if (!expandp)
{
/* They want the wildcarded version */
- font_name = build_string ((char*) names->data);
+ font_name = build_cistring ((char*) names->data);
}
else
{
@@ -483,7 +483,7 @@
x_font_names = XListFonts (dpy, (char*) names->data, 1, &nnames);
if (x_font_names)
{
- font_name = build_string (x_font_names[0]);
+ font_name = build_cistring (x_font_names[0]);
XFreeFontNames (x_font_names);
}
}
@@ -503,7 +503,7 @@
names = XListFonts (GDK_DISPLAY (), pattern, MAX_FONT_COUNT, &count);
while (count--)
- result = Fcons (build_ext_string (names [count], Qbinary), result);
+ result = Fcons (build_extstring (names [count], Qbinary), result);
if (names)
XFreeFontNames (names);
diff -r 19a72041c5ed -r 304aebb79cd3 src/objects-msw.c
--- a/src/objects-msw.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/objects-msw.c Wed Jan 27 00:35:36 2010 -0600
@@ -1141,7 +1141,7 @@
return 1;
/* Add the font name to the list if not already there */
- fontname_lispstr = build_intstring (fontname);
+ fontname_lispstr = build_istring (fontname);
if (NILP (Fassoc (fontname_lispstr, font_enum->list)))
font_enum->list =
Fcons (Fcons (fontname_lispstr,
@@ -1797,7 +1797,7 @@
ERROR_ME_DEBUG_WARN, &logfont, fontname, weight,
points, effects, charset))
signal_error (Qinternal_error, "Bad value in device font list?",
- build_intstring (truername));
+ build_istring (truername));
}
else if (!parse_font_spec (namestr, hdc, name_for_errors,
errb, &logfont, fontname, weight, points,
@@ -1817,7 +1817,7 @@
qxesprintf (truename, "%s:%s:%s:%s:%s", fontname, weight,
points, effects, charset);
- *truename_ret = build_intstring (truename);
+ *truename_ret = build_istring (truename);
return hfont;
}
@@ -1948,7 +1948,7 @@
if (match_font (XSTRING_DATA (XCAR (XCAR (fonttail))),
XSTRING_DATA (pattern),
fontname))
- result = Fcons (build_intstring (fontname), result);
+ result = Fcons (build_istring (fontname), result);
}
return Fnreverse (result);
@@ -2054,7 +2054,7 @@
spec. See if the FONTSIGNATURE data is already cached. If not, get
it and cache it. */
if (!STRINGP (reloc) || the_nonreloc != XSTRING_DATA (reloc))
- reloc = build_intstring (the_nonreloc);
+ reloc = build_istring (the_nonreloc);
GCPRO1 (reloc);
fontsig = Fgethash (reloc, Vfont_signature_data, Qunbound);
diff -r 19a72041c5ed -r 304aebb79cd3 src/objects-tty.c
--- a/src/objects-tty.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/objects-tty.c Wed Jan 27 00:35:36 2010 -0600
@@ -276,7 +276,7 @@
if (*str != '/')
return 0;
str++;
- charset = Ffind_charset (intern_int (str));
+ charset = Ffind_charset (intern_istring (str));
if (NILP (charset))
return 0;
#else
diff -r 19a72041c5ed -r 304aebb79cd3 src/objects-x.c
--- a/src/objects-x.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/objects-x.c Wed Jan 27 00:35:36 2010 -0600
@@ -733,7 +733,7 @@
if (truename)
{
- Lisp_Object result = build_ext_string (truename, Qx_font_name_encoding);
+ Lisp_Object result = build_extstring (truename, Qx_font_name_encoding);
XFree (truename);
return result;
}
@@ -767,7 +767,7 @@
if (res)
{
FONT_INSTANCE_TRUENAME (f) =
- build_ext_string ((Extbyte *) res, Qfc_font_name_encoding);
+ build_extstring ((Extbyte *) res, Qfc_font_name_encoding);
free (res);
return FONT_INSTANCE_TRUENAME (f);
}
@@ -834,7 +834,7 @@
ALLOCA, (name_str, name_len),
Qx_atom_name_encoding);
- name = (name_str ? intern_int (name_str) : Qnil);
+ name = (name_str ? intern_istring (name_str) : Qnil);
if (name_str &&
(atom == XA_FONT ||
atom == DEVICE_XATOM_FOUNDRY (d) ||
@@ -860,7 +860,7 @@
{
Extbyte *val_str = XGetAtomName (dpy, props [i].card32);
- value = (val_str ? build_ext_string (val_str, Qx_atom_name_encoding)
+ value = (val_str ? build_extstring (val_str, Qx_atom_name_encoding)
: Qnil);
}
else
@@ -890,7 +890,7 @@
names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
patternext, max_number, &count);
while (count--)
- result = Fcons (build_ext_string (names[count], Qx_font_name_encoding),
+ result = Fcons (build_extstring (names[count], Qx_font_name_encoding),
result);
if (names)
XFreeFontNames (names);
diff -r 19a72041c5ed -r 304aebb79cd3 src/print.c
--- a/src/print.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/print.c Wed Jan 27 00:35:36 2010 -0600
@@ -662,7 +662,7 @@
}
void
-write_c_string (Lisp_Object stream, const CIbyte *str)
+write_cistring (Lisp_Object stream, const CIbyte *str)
{
/* This function can GC */
write_istring (stream, (const Ibyte *) str);
@@ -1357,7 +1357,7 @@
if (max < len) last = max;
}
- write_c_string (printcharfun, start);
+ write_cistring (printcharfun, start);
for (i = 0; i < last; i++)
{
Lisp_Object elt = XVECTOR_DATA (obj)[i];
@@ -1367,7 +1367,7 @@
UNGCPRO;
if (last != len)
write_ascstring (printcharfun, " ...");
- write_c_string (printcharfun, end);
+ write_cistring (printcharfun, end);
}
void
diff -r 19a72041c5ed -r 304aebb79cd3 src/process-nt.c
--- a/src/process-nt.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/process-nt.c Wed Jan 27 00:35:36 2010 -0600
@@ -1313,7 +1313,7 @@
return host;
if (address.sin_family == AF_INET)
- return build_ext_string (inet_ntoa (address.sin_addr),
+ return build_extstring (inet_ntoa (address.sin_addr),
Qunix_host_name_encoding);
else
return host;
diff -r 19a72041c5ed -r 304aebb79cd3 src/process-unix.c
--- a/src/process-unix.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/process-unix.c Wed Jan 27 00:35:36 2010 -0600
@@ -1300,7 +1300,7 @@
if (separate_err)
retry_close (forkerr);
- p->tty_name = pty_flag ? build_intstring (pty_name) : Qnil;
+ p->tty_name = pty_flag ? build_istring (pty_name) : Qnil;
/* Notice that SIGCHLD was not blocked. (This is not possible on
some systems.) No biggie if SIGCHLD occurs right around the
@@ -1833,7 +1833,7 @@
int gni = getnameinfo (res->ai_addr, res->ai_addrlen,
addrbuf, sizeof(addrbuf),
NULL, 0, NI_NUMERICHOST);
- canonname = gni ? host : build_ext_string (addrbuf,
+ canonname = gni ? host : build_extstring (addrbuf,
Qunix_host_name_encoding);
freeaddrinfo (res);
@@ -1847,7 +1847,7 @@
return host;
if (address.sin_family == AF_INET)
- return build_ext_string (inet_ntoa (address.sin_addr),
+ return build_extstring (inet_ntoa (address.sin_addr),
Qunix_host_name_encoding);
else
/* #### any clue what to do here? */
diff -r 19a72041c5ed -r 304aebb79cd3 src/process.c
--- a/src/process.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/process.c Wed Jan 27 00:35:36 2010 -0600
@@ -1570,7 +1570,7 @@
if (EQ (symbol, Qsignal) || EQ (symbol, Qstop))
{
- string = build_string (signal_name (code));
+ string = build_cistring (signal_name (code));
if (coredump)
string2 = build_msg_string (" (core dumped)\n");
else
@@ -1696,9 +1696,9 @@
int spec = process_setup_for_insertion (process, 0);
NGCPRO1 (process);
- buffer_insert_c_string (current_buffer, "\nProcess ");
+ buffer_insert_ascstring (current_buffer, "\nProcess ");
Finsert (1, &p->name);
- buffer_insert_c_string (current_buffer, " ");
+ buffer_insert_ascstring (current_buffer, " ");
Finsert (1, &msg);
Fset_marker (p->mark, make_int (BUF_PT (current_buffer)),
p->buffer);
@@ -2434,12 +2434,12 @@
_wgetenv (L""); /* force initialization of _wenviron */
for (envp = (Extbyte **) _wenviron; envp && *envp; envp++)
Vprocess_environment =
- Fcons (build_ext_string (*envp, Qmswindows_unicode),
+ Fcons (build_extstring (*envp, Qmswindows_unicode),
Vprocess_environment);
#else
for (envp = environ; envp && *envp; envp++)
Vprocess_environment =
- Fcons (build_ext_string (*envp, Qenvironment_variable_encoding),
+ Fcons (build_extstring (*envp, Qenvironment_variable_encoding),
Vprocess_environment);
#endif
/* This gets set back to 0 in disksave_object_finalization() */
@@ -2479,12 +2479,12 @@
{
Ibyte *faux_var = alloca_ibytes (7 + qxestrlen (shell));
qxesprintf (faux_var, "SHELL=%s", shell);
- Vprocess_environment = Fcons (build_intstring (faux_var),
+ Vprocess_environment = Fcons (build_istring (faux_var),
Vprocess_environment);
}
#endif /* 0 */
- Vshell_file_name = build_intstring (shell);
+ Vshell_file_name = build_istring (shell);
}
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/redisplay-tty.c
--- a/src/redisplay-tty.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/redisplay-tty.c Wed Jan 27 00:35:36 2010 -0600
@@ -1412,7 +1412,7 @@
char *sequence = tgetstr (keys[i].cap, address);
if (sequence)
Fdefine_key (function_key_map,
- build_ext_string (sequence, Qbinary),
+ build_extstring (sequence, Qbinary),
vector1 (intern (keys[i].name)));
}
@@ -1426,11 +1426,11 @@
const char *k0 = tgetstr ("k0", address);
if (k_semi)
- Fdefine_key (function_key_map, build_ext_string (k_semi, Qbinary),
+ Fdefine_key (function_key_map, build_extstring (k_semi, Qbinary),
vector1 (intern ("f10")));
if (k0)
- Fdefine_key (function_key_map, build_ext_string (k0, Qbinary),
+ Fdefine_key (function_key_map, build_extstring (k0, Qbinary),
vector1 (intern (k_semi ? "f0" : "f10")));
}
@@ -1454,7 +1454,7 @@
{
sprintf (fkey, "f%d", i);
Fdefine_key (function_key_map,
- build_ext_string (sequence, Qbinary),
+ build_extstring (sequence, Qbinary),
vector1 (intern (fkey)));
}
}
@@ -1470,7 +1470,7 @@
char *sequence = tgetstr (cap2, address); \
if (sequence) \
Fdefine_key (function_key_map, \
- build_ext_string (sequence, Qbinary), \
+ build_extstring (sequence, Qbinary), \
vector1 (intern (keyname))); \
} \
} while (0)
diff -r 19a72041c5ed -r 304aebb79cd3 src/search.c
--- a/src/search.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/search.c Wed Jan 27 00:35:36 2010 -0600
@@ -184,7 +184,7 @@
re_set_syntax (old);
if (val)
{
- maybe_signal_error (Qinvalid_regexp, 0, build_string (val),
+ maybe_signal_error (Qinvalid_regexp, 0, build_cistring (val),
Qsearch, errb);
return 0;
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/select-common.h
--- a/src/select-common.h Tue Jan 26 23:22:30 2010 -0600
+++ b/src/select-common.h Wed Jan 27 00:35:36 2010 -0600
@@ -82,7 +82,7 @@
/* Convert any 8-bit data to a string, for compactness. */
else if (format == 8)
- return make_ext_string ((Extbyte *) data, size,
+ return make_extstring ((Extbyte *) data, size,
type == DEVICE_XATOM_TEXT (d) ||
type == DEVICE_XATOM_COMPOUND_TEXT (d)
? Qctext : Qbinary);
@@ -96,7 +96,7 @@
/* Convert any 8-bit data to a string, for compactness. */
else if (format == 8)
- return make_ext_string ((Extbyte *) data, size,
+ return make_extstring ((Extbyte *) data, size,
((type == gdk_atom_intern ("TEXT", FALSE)) ||
(type == gdk_atom_intern ("COMPOUND_TEXT", FALSE)))
? Qctext : Qbinary);
diff -r 19a72041c5ed -r 304aebb79cd3 src/select-gtk.c
--- a/src/select-gtk.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/select-gtk.c Wed Jan 27 00:35:36 2010 -0600
@@ -78,7 +78,7 @@
EXTERNAL_TO_C_STRING (str, intstr, Qctext);
g_free (str);
- return intern_int (intstr);
+ return intern_istring (intstr);
}
}
diff -r 19a72041c5ed -r 304aebb79cd3 src/select-msw.c
--- a/src/select-msw.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/select-msw.c Wed Jan 27 00:35:36 2010 -0600
@@ -561,7 +561,7 @@
}
/* Place it in a Lisp string */
- ret = make_ext_string ((Extbyte *) data, size, Qbinary);
+ ret = make_extstring ((Extbyte *) data, size, Qbinary);
GlobalUnlock (data);
CloseClipboard ();
diff -r 19a72041c5ed -r 304aebb79cd3 src/select-x.c
--- a/src/select-x.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/select-x.c Wed Jan 27 00:35:36 2010 -0600
@@ -192,7 +192,7 @@
C_STRING_ALLOCA, intstr,
Qctext);
XFree (str);
- return intern_int (intstr);
+ return intern_istring (intstr);
}
}
@@ -1377,7 +1377,7 @@
COMPOUND_TEXT that we stored there ourselves earlier,
in x-store-cutbuffer-internal */
ret = (bytes ?
- make_ext_string ((Extbyte *) data, bytes,
+ make_extstring ((Extbyte *) data, bytes,
memchr (data, 0x1b, bytes) ?
Qctext : Qbinary)
: Qnil);
diff -r 19a72041c5ed -r 304aebb79cd3 src/symbols.c
--- a/src/symbols.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/symbols.c Wed Jan 27 00:35:36 2010 -0600
@@ -177,7 +177,7 @@
}
Lisp_Object
-intern_int (const Ibyte *str)
+intern_istring (const Ibyte *str)
{
Bytecount len = qxestrlen (str);
Lisp_Object obarray = Vobarray;
@@ -197,7 +197,7 @@
Lisp_Object
intern (const CIbyte *str)
{
- return intern_int ((Ibyte *) str);
+ return intern_istring ((Ibyte *) str);
}
Lisp_Object
@@ -210,7 +210,7 @@
for (i = 0; i < len; i++)
if (tmp[i] == '_')
tmp[i] = '-';
- return intern_int ((Ibyte *) tmp);
+ return intern_istring ((Ibyte *) tmp);
}
DEFUN ("intern", Fintern, 1, 2, 0, /*
diff -r 19a72041c5ed -r 304aebb79cd3 src/sysdep.c
--- a/src/sysdep.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/sysdep.c Wed Jan 27 00:35:36 2010 -0600
@@ -2037,7 +2037,7 @@
#elif !defined (HAVE_GETHOSTNAME)
struct utsname uts;
uname (&uts);
- Vsystem_name = build_ext_string (uts.nodename, Qunix_host_name_encoding);
+ Vsystem_name = build_extstring (uts.nodename, Qunix_host_name_encoding);
#else /* HAVE_GETHOSTNAME */
int hostname_size = 256;
Extbyte *hostname = alloca_extbytes (hostname_size);
@@ -2124,7 +2124,7 @@
# endif /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */
}
# endif /* HAVE_SOCKETS */
- Vsystem_name = build_ext_string (hostname, Qunix_host_name_encoding);
+ Vsystem_name = build_extstring (hostname, Qunix_host_name_encoding);
#endif /* HAVE_GETHOSTNAME */
{
Ibyte *p;
diff -r 19a72041c5ed -r 304aebb79cd3 src/sysdll.c
--- a/src/sysdll.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/sysdll.c Wed Jan 27 00:35:36 2010 -0600
@@ -117,7 +117,7 @@
#else
msg = (const Extbyte *) "Shared library error";
#endif
- return build_ext_string (msg, Qerror_message_encoding);
+ return build_extstring (msg, Qerror_message_encoding);
}
#elif defined(HAVE_SHL_LOAD)
@@ -454,7 +454,7 @@
int errorNumber;
const Extbyte *fileNameWithError, *errorString;
NSLinkEditError (&c, &errorNumber, &fileNameWithError, &errorString);
- return build_ext_string (errorString, Qerror_message_encoding);
+ return build_extstring (errorString, Qerror_message_encoding);
}
#elif HAVE_LTDL
/* Libtool's libltdl */
@@ -503,7 +503,7 @@
Lisp_Object
dll_error (void)
{
- return build_ext_string (lt_dlerror (), Qerror_message_encoding);
+ return build_extstring (lt_dlerror (), Qerror_message_encoding);
}
#else
/* Catchall if we don't know about this system's method of dynamic loading */
diff -r 19a72041c5ed -r 304aebb79cd3 src/syswindows.h
--- a/src/syswindows.h Tue Jan 26 23:22:30 2010 -0600
+++ b/src/syswindows.h Wed Jan 27 00:35:36 2010 -0600
@@ -846,7 +846,7 @@
EXTERNAL_TO_C_STRING_MALLOC (in, out, Qmswindows_tstr)
#define build_tstr_string(in) \
- make_ext_string (in, qxetcsbytelen ((Extbyte *) in), Qmswindows_tstr)
+ make_extstring (in, qxetcsbytelen ((Extbyte *) in), Qmswindows_tstr)
#define MAX_ANSI_CHAR_LEN 1
#define MAX_UNICODE_CHAR_LEN 2
diff -r 19a72041c5ed -r 304aebb79cd3 src/tests.c
--- a/src/tests.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/tests.c Wed Jan 27 00:35:36 2010 -0600
@@ -148,20 +148,20 @@
#define DFC_CHECK_LENGTH(len1,len2,str1) \
else if ((len1) != (len2)) \
conversion_result = \
- Fcons (list3 (build_string(str1), Qnil, build_ascstring("wrong length")), \
+ Fcons (list3 (build_cistring(str1), Qnil, build_ascstring("wrong length")), \
conversion_result)
#define DFC_CHECK_CONTENT(str1,str2,len1,str3) \
else if (memcmp (str1, str2, len1)) \
conversion_result = \
- Fcons (list3 (build_string(str3), Qnil, \
+ Fcons (list3 (build_cistring(str3), Qnil, \
build_ascstring("octet comparison failed")), \
conversion_result)
#define DFC_RESULT_PASS(str1) \
else \
conversion_result = \
- Fcons (list3 (build_string(str1), Qt, Qnil), \
+ Fcons (list3 (build_cistring(str1), Qt, Qnil), \
conversion_result)
#ifdef MULE
diff -r 19a72041c5ed -r 304aebb79cd3 src/text.c
--- a/src/text.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/text.c Wed Jan 27 00:35:36 2010 -0600
@@ -4532,8 +4532,8 @@
/* We handle here the cases where SRC is a Lisp_Object, internal data
(sized or unsized), or external data (sized or unsized), and return type
is unsized alloca() or malloc() data. If the return type is a
- Lisp_Object, use build_ext_string() for unsized external data,
- make_ext_string() for sized external data. If the return type needs to
+ Lisp_Object, use build_extstring() for unsized external data,
+ make_extstring() for sized external data. If the return type needs to
be sized data, use the *_TO_SIZED_*() macros, and for other more
complicated cases, use the original TO_*_FORMAT() macros. */
diff -r 19a72041c5ed -r 304aebb79cd3 src/text.h
--- a/src/text.h Tue Jan 26 23:22:30 2010 -0600
+++ b/src/text.h Wed Jan 27 00:35:36 2010 -0600
@@ -2431,7 +2431,7 @@
of conversions involving raw data and/or Lisp strings, especially when
the output is an alloca()ed string. (When the destination is a
Lisp_String, there are other functions that should be used instead --
- build_ext_string() and make_ext_string(), for example.) The convenience
+ build_extstring() and make_extstring(), for example.) The convenience
macros are of two types -- the older kind that store the result into a
specified variable, and the newer kind that return the result. The newer
kind of macros don't exist when the output is sized data, because that
@@ -2854,8 +2854,8 @@
#define LISP_STRING_TO_SIZED_EXTERNAL(in, out, outlen, codesys) \
TO_EXTERNAL_FORMAT (LISP_STRING, in, ALLOCA, (out, outlen), codesys)
-/* In place of EXTERNAL_TO_LISP_STRING(), use build_ext_string() and/or
- make_ext_string(). */
+/* In place of EXTERNAL_TO_LISP_STRING(), use build_extstring() and/or
+ make_extstring(). */
#ifdef TEST_NEW_DFC
#define C_STRING_TO_EXTERNAL_MALLOC(in, out, codesys) \
@@ -2992,7 +2992,7 @@
#define wext_atol(str) wcstol (str, 0, 10)
#define wext_sprintf wsprintfW /* Huh? both wsprintfA and wsprintfW? */
#define wext_getenv _wgetenv
-#define build_wext_string(str, cs) build_ext_string ((Extbyte *) str, cs)
+#define build_wext_string(str, cs) build_extstring ((Extbyte *) str, cs)
#define WEXTTEXT_TO_8_BIT(arg) WEXTTEXT_TO_MULTIBYTE(arg)
#ifdef WIN32_NATIVE
int XCDECL wext_retry_open (const Wexttext *path, int oflag, ...);
@@ -3017,7 +3017,7 @@
#define wext_atol(str) atol (str)
#define wext_sprintf sprintf
#define wext_getenv getenv
-#define build_wext_string build_ext_string
+#define build_wext_string build_extstring
#define wext_retry_open retry_open
#define wext_access access
#define wext_stat stat
diff -r 19a72041c5ed -r 304aebb79cd3 src/tooltalk.c
--- a/src/tooltalk.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/tooltalk.c Wed Jan 27 00:35:36 2010 -0600
@@ -514,7 +514,7 @@
static Lisp_Object
tt_build_c_string (char *s)
{
- return build_string (s ? s : "");
+ return build_cistring (s ? s : "");
}
static Lisp_Object
@@ -1216,7 +1216,7 @@
())
{
Extbyte *procid = tt_default_procid ();
- return procid ? build_ext_string (procid, Qtooltalk_encoding) : Qnil;
+ return procid ? build_extstring (procid, Qtooltalk_encoding) : Qnil;
}
DEFUN ("tooltalk-default-session", Ftooltalk_default_session, 0, 0, 0, /*
@@ -1225,7 +1225,7 @@
())
{
Extbyte *session = tt_default_session ();
- return session ? build_ext_string (session, Qtooltalk_encoding) : Qnil;
+ return session ? build_extstring (session, Qtooltalk_encoding) : Qnil;
}
static void
diff -r 19a72041c5ed -r 304aebb79cd3 src/ui-byhand.c
--- a/src/ui-byhand.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/ui-byhand.c Wed Jan 27 00:35:36 2010 -0600
@@ -187,7 +187,7 @@
if (text)
{
- rval = build_string (text);
+ rval = build_cistring (text);
/* NOTE: This is NOT a memory leak. GtkCList returns a pointer
to internally used memory, not a copy of it.
g_free (text);
@@ -274,7 +274,7 @@
return (list3 (pixmap ? build_gtk_boxed (pixmap, GTK_TYPE_GDK_WINDOW) : Qnil,
mask ? build_gtk_boxed (mask, GTK_TYPE_GDK_WINDOW) : Qnil,
- (text && text[0]) ? build_string (text) : Qnil));
+ (text && text[0]) ? build_cistring (text) : Qnil));
}
/* void gtk_color_selection_get_color(GtkColorSelection *colorsel, gdouble *color); */
@@ -425,7 +425,7 @@
gtk_label_get (GTK_LABEL (XGTK_OBJECT (label)->object), &string);
- return (build_string (string));
+ return (build_cistring (string));
}
DEFUN ("gtk-notebook-query-tab-label-packing", Fgtk_notebook_query_tab_label_packing, 2, 2, 0, /*
diff -r 19a72041c5ed -r 304aebb79cd3 src/ui-gtk.c
--- a/src/ui-gtk.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/ui-gtk.c Wed Jan 27 00:35:36 2010 -0600
@@ -800,7 +800,7 @@
write_ascstring (printcharfun, "#<GtkObject (");
if (XGTK_OBJECT (obj)->alive_p)
- write_c_string (printcharfun, gtk_type_name (GTK_OBJECT_TYPE (XGTK_OBJECT (obj)->object)));
+ write_cistring (printcharfun, gtk_type_name (GTK_OBJECT_TYPE (XGTK_OBJECT (obj)->object)));
else
write_ascstring (printcharfun, "dead");
write_fmt_string (printcharfun, ") %p>", (void *) XGTK_OBJECT (obj)->object);
@@ -1118,7 +1118,7 @@
printing_unreadable_lcrecord (obj, 0);
write_ascstring (printcharfun, "#<GtkBoxed (");
- write_c_string (printcharfun, gtk_type_name (XGTK_BOXED (obj)->object_type));
+ write_cistring (printcharfun, gtk_type_name (XGTK_BOXED (obj)->object_type));
write_fmt_string (printcharfun, ") %p>", (void *) XGTK_BOXED (obj)->object);
}
@@ -1497,7 +1497,7 @@
case GTK_TYPE_DOUBLE:
return (make_float (GTK_VALUE_DOUBLE (*arg)));
case GTK_TYPE_STRING:
- return (build_string (GTK_VALUE_STRING (*arg)));
+ return (build_cistring (GTK_VALUE_STRING (*arg)));
case GTK_TYPE_FLAGS:
return (flags_to_list (GTK_VALUE_FLAGS (*arg), arg->type));
case GTK_TYPE_ENUM:
@@ -2137,7 +2137,7 @@
if (NILP (alist))
{
- invalid_argument ("Unknown enumeration", build_string (gtk_type_name (t)));
+ invalid_argument ("Unknown enumeration", build_cistring (gtk_type_name (t)));
}
value = Fassq (obj, alist);
@@ -2206,7 +2206,7 @@
if (NILP (alist))
{
- invalid_argument ("Unknown enumeration", build_string (gtk_type_name (t)));
+ invalid_argument ("Unknown enumeration", build_cistring (gtk_type_name (t)));
}
cell = Frassq (make_int (value), alist);
diff -r 19a72041c5ed -r 304aebb79cd3 src/unexaix.c
--- a/src/unexaix.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/unexaix.c Wed Jan 27 00:35:36 2010 -0600
@@ -122,7 +122,7 @@
if (fd)
close (fd);
report_error_with_errno (Qio_error, "Cannot unexec",
- build_string (file));
+ build_cistring (file));
}
#endif /* emacs */
diff -r 19a72041c5ed -r 304aebb79cd3 src/unexec.c
--- a/src/unexec.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/unexec.c Wed Jan 27 00:35:36 2010 -0600
@@ -298,7 +298,7 @@
if (fd)
close (fd);
report_error_with_errno (Qio_error, "Cannot unexec",
- build_ext_string (file, Qfile_name));
+ build_extstring (file, Qfile_name));
}
#endif /* emacs */
diff -r 19a72041c5ed -r 304aebb79cd3 src/unicode.c
--- a/src/unicode.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/unicode.c Wed Jan 27 00:35:36 2010 -0600
@@ -1155,7 +1155,7 @@
qxesprintf(setname, "jit-ucs-charset-%d", number_of_jit_charsets);
Vcurrent_jit_charset = Fmake_charset
- (intern_int (setname), Vcharset_descr,
+ (intern_istring (setname), Vcharset_descr,
/* Set encode-as-utf-8 to t, to have this character set written
using UTF-8 escapes in escape-quoted and ctext. This
sidesteps the fact that our internal character -> Unicode
diff -r 19a72041c5ed -r 304aebb79cd3 src/win32.c
--- a/src/win32.c Tue Jan 26 23:22:30 2010 -0600
+++ b/src/win32.c Wed Jan 27 00:35:36 2010 -0600
@@ -95,7 +95,7 @@
TSTR_TO_C_STRING (path, ttlff);
INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, ttlff);
- return build_intstring (ttlff);
+ return build_istring (ttlff);
}
/* Normalize filename by converting all path separators to the specified
@@ -405,7 +405,7 @@
/* Use mule and cygwin-safe APIs top get at file data. */
LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (p, p);
- return build_intstring (p);
+ return build_istring (p);
}
#endif
diff -r 19a72041c5ed -r 304aebb79cd3 src/xemacs.def.in.in
--- a/src/xemacs.def.in.in Tue Jan 26 23:22:30 2010 -0600
+++ b/src/xemacs.def.in.in Wed Jan 27 00:35:36 2010 -0600
@@ -50,9 +50,9 @@
#ifdef USE_ASSERTIONS
assert_failed /* abort(), assert(), etc. */
#endif
-build_ext_string
-build_intstring
-build_string
+build_extstring
+build_istring
+build_cistring
build_ascstring
build_msg_istring
build_msg_cistring
@@ -143,7 +143,7 @@
list4
list5
list6
-make_ext_string
+make_extstring
make_float
make_opaque_ptr
make_string
@@ -228,7 +228,7 @@
#ifdef XEMACS_DEFS_NEEDS_ERROR_CHECK_TYPES_DECLS
wrap_record_1
#endif
-write_c_string
+write_cistring
write_fmt_string
write_fmt_string_lisp
write_istring
More information about the XEmacs-Patches
mailing list