Mercurial > hg > xemacs-beta

comparison src/file-coding.c @ 4953:304aebb79cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
function renamings to track names of char typedefs -------------------- ChangeLog entries follow: -------------------- man/ChangeLog addition: 2010-01-27 Ben Wing <ben@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@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@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.
author Ben Wing <ben@xemacs.org>
date Wed, 27 Jan 2010 00:35:36 -0600
parents 19a72041c5ed
children 0d4c9d0f6a8d
comparison
equal deleted inserted replaced
4952:19a72041c5ed 4953:304aebb79cd3
671 eidel (desired_base, length - (sizeof ("-dos") - 1), -1, 671 eidel (desired_base, length - (sizeof ("-dos") - 1), -1,
672 4, 4); 672 4, 4);
673 } 673 }
674 } 674 }
675 675
676 coding_system_or_name = intern_int (eidata (desired_base)); 676 coding_system_or_name = intern_istring (eidata (desired_base));
677 677
678 /* Remove this coding system and its subsidiary coding 678 /* Remove this coding system and its subsidiary coding
679 systems from the hash, to avoid calling this code recursively. */ 679 systems from the hash, to avoid calling this code recursively. */
680 Fremhash (coding_system_or_name, Vcoding_system_hash_table); 680 Fremhash (coding_system_or_name, Vcoding_system_hash_table);
681 Fremhash (add_suffix_to_symbol(coding_system_or_name, "-unix"), 681 Fremhash (add_suffix_to_symbol(coding_system_or_name, "-unix"),
1099 const Ascbyte *extension = coding_subsidiary_list[i].extension; 1099 const Ascbyte *extension = coding_subsidiary_list[i].extension;
1100 const Ascbyte *mnemonic_ext = coding_subsidiary_list[i].mnemonic_ext; 1100 const Ascbyte *mnemonic_ext = coding_subsidiary_list[i].mnemonic_ext;
1101 enum eol_type eol = coding_subsidiary_list[i].eol; 1101 enum eol_type eol = coding_subsidiary_list[i].eol;
1102 1102
1103 qxestrcpy_ascii (codesys_name + len, extension); 1103 qxestrcpy_ascii (codesys_name + len, extension);
1104 codesys_name_sym = intern_int (codesys_name); 1104 codesys_name_sym = intern_istring (codesys_name);
1105 if (mlen != -1) 1105 if (mlen != -1)
1106 qxestrcpy_ascii (codesys_mnemonic + mlen, mnemonic_ext); 1106 qxestrcpy_ascii (codesys_mnemonic + mlen, mnemonic_ext);
1107 1107
1108 sub_codesys = Fcopy_coding_system (codesys, codesys_name_sym); 1108 sub_codesys = Fcopy_coding_system (codesys, codesys_name_sym);
1109 if (mlen != -1) 1109 if (mlen != -1)
1110 XCODING_SYSTEM_MNEMONIC (sub_codesys) = 1110 XCODING_SYSTEM_MNEMONIC (sub_codesys) =
1111 build_intstring (codesys_mnemonic); 1111 build_istring (codesys_mnemonic);
1112 1112
1113 if (eol != EOL_LF) 1113 if (eol != EOL_LF)
1114 { 1114 {
1115 Lisp_Object chain = list2 (get_coding_system_for_text_file 1115 Lisp_Object chain = list2 (get_coding_system_for_text_file
1116 (codesys, 0), 1116 (codesys, 0),
1119 Lisp_Object canon = 1119 Lisp_Object canon =
1120 make_internal_coding_system 1120 make_internal_coding_system
1121 (sub_codesys, "internal-subsidiary-eol-wrapper", 1121 (sub_codesys, "internal-subsidiary-eol-wrapper",
1122 Qchain, Qunbound, 1122 Qchain, Qunbound,
1123 mlen != -1 ? 1123 mlen != -1 ?
1124 list6 (Qmnemonic, build_intstring (codesys_mnemonic), 1124 list6 (Qmnemonic, build_istring (codesys_mnemonic),
1125 Qchain, chain, 1125 Qchain, chain,
1126 Qcanonicalize_after_coding, sub_codesys) : 1126 Qcanonicalize_after_coding, sub_codesys) :
1127 list4 (Qchain, chain, 1127 list4 (Qchain, chain,
1128 Qcanonicalize_after_coding, sub_codesys)); 1128 Qcanonicalize_after_coding, sub_codesys));
1129 XCODING_SYSTEM_CANONICAL (sub_codesys) = canon; 1129 XCODING_SYSTEM_CANONICAL (sub_codesys) = canon;
1205 prefix, 1205 prefix,
1206 NILP (name_or_existing) ? (Ibyte *) "nil" : 1206 NILP (name_or_existing) ? (Ibyte *) "nil" :
1207 XSTRING_DATA (Fsymbol_name (XCODING_SYSTEM_NAME 1207 XSTRING_DATA (Fsymbol_name (XCODING_SYSTEM_NAME
1208 (name_or_existing))), 1208 (name_or_existing))),
1209 ++coding_system_tick); 1209 ++coding_system_tick);
1210 name_or_existing = intern_int (newname); 1210 name_or_existing = intern_istring (newname);
1211 xfree (newname, Ibyte *); 1211 xfree (newname, Ibyte *);
1212 1212
1213 if (UNBOUNDP (description)) 1213 if (UNBOUNDP (description))
1214 { 1214 {
1215 newname = 1215 newname =
1216 emacs_sprintf_malloc 1216 emacs_sprintf_malloc
1217 (NULL, "For Internal Use (%s)", 1217 (NULL, "For Internal Use (%s)",
1218 XSTRING_DATA (Fsymbol_name (name_or_existing))); 1218 XSTRING_DATA (Fsymbol_name (name_or_existing)));
1219 description = build_intstring (newname); 1219 description = build_istring (newname);
1220 xfree (newname, Ibyte *); 1220 xfree (newname, Ibyte *);
1221 } 1221 }
1222 1222
1223 newname = emacs_sprintf_malloc (NULL, "Int%d", coding_system_tick); 1223 newname = emacs_sprintf_malloc (NULL, "Int%d", coding_system_tick);
1224 defmnem = build_intstring (newname); 1224 defmnem = build_istring (newname);
1225 xfree (newname, Ibyte *); 1225 xfree (newname, Ibyte *);
1226 } 1226 }
1227 else 1227 else
1228 CHECK_SYMBOL (name_or_existing); 1228 CHECK_SYMBOL (name_or_existing);
1229 1229
1368 Ibyte *newname = 1368 Ibyte *newname =
1369 emacs_sprintf_malloc 1369 emacs_sprintf_malloc
1370 (NULL, "internal-eol-copy-%s-%d", 1370 (NULL, "internal-eol-copy-%s-%d",
1371 XSTRING_DATA (Fsymbol_name (name_or_existing)), 1371 XSTRING_DATA (Fsymbol_name (name_or_existing)),
1372 ++coding_system_tick); 1372 ++coding_system_tick);
1373 Lisp_Object newnamesym = intern_int (newname); 1373 Lisp_Object newnamesym = intern_istring (newname);
1374 Lisp_Object copied = Fcopy_coding_system (csobj, newnamesym); 1374 Lisp_Object copied = Fcopy_coding_system (csobj, newnamesym);
1375 xfree (newname, Ibyte *); 1375 xfree (newname, Ibyte *);
1376 1376
1377 XCODING_SYSTEM_CANONICAL (csobj) = 1377 XCODING_SYSTEM_CANONICAL (csobj) =
1378 make_internal_coding_system 1378 make_internal_coding_system
3711 "0123456789" 3711 "0123456789"
3712 "!$%&*+-.^_{|}~"); 3712 "!$%&*+-.^_{|}~");
3713 if (n > 0) 3713 if (n > 0)
3714 { 3714 {
3715 name[n] = '\0'; 3715 name[n] = '\0';
3716 /* This call to intern_int() is OK because we already verified that 3716 /* This call to intern_istring() is OK because we already verified that
3717 there are only ASCII characters in the string */ 3717 there are only ASCII characters in the string */
3718 return find_coding_system_for_text_file (intern_int ((Ibyte *) name), 0); 3718 return find_coding_system_for_text_file (intern_istring ((Ibyte *) name), 0);
3719 } 3719 }
3720 3720
3721 return Qnil; 3721 return Qnil;
3722 } 3722 }
3723 3723