Mercurial > hg > xemacs-beta

comparison src/editfns.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 e813cf16c015
comparison
equal deleted inserted replaced
4952:19a72041c5ed 4953:304aebb79cd3
93 return; 93 return;
94 94
95 if ((p = egetenv ("NAME"))) 95 if ((p = egetenv ("NAME")))
96 /* I don't think it's the right thing to do the ampersand 96 /* I don't think it's the right thing to do the ampersand
97 modification on NAME. Not that it matters anymore... -hniksic */ 97 modification on NAME. Not that it matters anymore... -hniksic */
98 Vuser_full_name = build_intstring (p); 98 Vuser_full_name = build_istring (p);
99 else 99 else
100 Vuser_full_name = Fuser_full_name (Qnil); 100 Vuser_full_name = Fuser_full_name (Qnil);
101 } 101 }
102 102
103 DEFUN ("char-to-string", Fchar_to_string, 1, 1, 0, /* 103 DEFUN ("char-to-string", Fchar_to_string, 1, 1, 0, /*
647 tmpdir = (Ibyte *) "/tmp"; 647 tmpdir = (Ibyte *) "/tmp";
648 } 648 }
649 } 649 }
650 #endif 650 #endif
651 651
652 return build_intstring (tmpdir); 652 return build_istring (tmpdir);
653 } 653 }
654 654
655 DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /* 655 DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /*
656 Return the name under which the user logged in, as a string. 656 Return the name under which the user logged in, as a string.
657 This is based on the effective uid, not the real uid. 657 This is based on the effective uid, not the real uid.
676 returned_name = user_login_name (NULL); 676 returned_name = user_login_name (NULL);
677 } 677 }
678 /* #### - I believe this should return nil instead of "unknown" when pw==0 678 /* #### - I believe this should return nil instead of "unknown" when pw==0
679 pw=0 is indicated by a null return from user_login_name 679 pw=0 is indicated by a null return from user_login_name
680 */ 680 */
681 return returned_name ? build_intstring (returned_name) : Qnil; 681 return returned_name ? build_istring (returned_name) : Qnil;
682 } 682 }
683 683
684 /* This function may be called from other C routines when a 684 /* This function may be called from other C routines when a
685 character string representation of the user_login_name is 685 character string representation of the user_login_name is
686 needed but a Lisp Object is not. The UID is passed by 686 needed but a Lisp Object is not. The UID is passed by
742 ()) 742 ())
743 { 743 {
744 struct passwd *pw = qxe_getpwuid (getuid ()); 744 struct passwd *pw = qxe_getpwuid (getuid ());
745 /* #### - I believe this should return nil instead of "unknown" when pw==0 */ 745 /* #### - I believe this should return nil instead of "unknown" when pw==0 */
746 746
747 return build_ext_string (pw ? pw->pw_name : "unknown", Quser_name_encoding); 747 return build_extstring (pw ? pw->pw_name : "unknown", Quser_name_encoding);
748 } 748 }
749 749
750 DEFUN ("user-uid", Fuser_uid, 0, 0, 0, /* 750 DEFUN ("user-uid", Fuser_uid, 0, 0, 0, /*
751 Return the effective uid of Emacs, as an integer. 751 Return the effective uid of Emacs, as an integer.
752 */ 752 */
893 ()) 893 ())
894 { 894 {
895 Ibyte *path = get_home_directory (); 895 Ibyte *path = get_home_directory ();
896 896
897 return !path ? Qnil : 897 return !path ? Qnil :
898 Fexpand_file_name (Fsubstitute_in_file_name (build_intstring (path)), 898 Fexpand_file_name (Fsubstitute_in_file_name (build_istring (path)),
899 Qnil); 899 Qnil);
900 } 900 }
901 901
902 DEFUN ("system-name", Fsystem_name, 0, 0, 0, /* 902 DEFUN ("system-name", Fsystem_name, 0, 0, 0, /*
903 Return the name of the machine you are running on, as a string. 903 Return the name of the machine you are running on, as a string.
1076 potentially data lossy. */ 1076 potentially data lossy. */
1077 LISP_STRING_TO_EXTERNAL (format_string, formext, 1077 LISP_STRING_TO_EXTERNAL (format_string, formext,
1078 Qtime_function_encoding); 1078 Qtime_function_encoding);
1079 if (emacs_strftime (buf, size, formext, &tm) 1079 if (emacs_strftime (buf, size, formext, &tm)
1080 || !*buf) 1080 || !*buf)
1081 return build_ext_string (buf, Qtime_function_encoding); 1081 return build_extstring (buf, Qtime_function_encoding);
1082 /* If buffer was too small, make it bigger. */ 1082 /* If buffer was too small, make it bigger. */
1083 size *= 2; 1083 size *= 2;
1084 } 1084 }
1085 } 1085 }
1086 1086
1235 */ 1235 */
1236 (specified_time)) 1236 (specified_time))
1237 { 1237 {
1238 time_t value; 1238 time_t value;
1239 Ibyte *the_ctime; 1239 Ibyte *the_ctime;
1240 EMACS_INT len; /* this is what make_ext_string() accepts; #### 1240 EMACS_INT len; /* this is what make_extstring() accepts; ####
1241 should it be an Bytecount? */ 1241 should it be an Bytecount? */
1242 1242
1243 if (! lisp_to_time (specified_time, &value)) 1243 if (! lisp_to_time (specified_time, &value))
1244 value = -1; 1244 value = -1;
1245 the_ctime = qxe_ctime (&value); 1245 the_ctime = qxe_ctime (&value);
1318 if (t->tm_isdst == 0 || t->tm_isdst == 1) 1318 if (t->tm_isdst == 0 || t->tm_isdst == 1)
1319 s = tzname[t->tm_isdst]; 1319 s = tzname[t->tm_isdst];
1320 #endif 1320 #endif
1321 #endif /* not HAVE_TM_ZONE */ 1321 #endif /* not HAVE_TM_ZONE */
1322 if (s) 1322 if (s)
1323 tem = build_ext_string (s, Qtime_zone_encoding); 1323 tem = build_extstring (s, Qtime_zone_encoding);
1324 else 1324 else
1325 { 1325 {
1326 Ibyte buf[6]; 1326 Ibyte buf[6];
1327 1327
1328 /* No local time zone name is available; use "+-NNNN" instead. */ 1328 /* No local time zone name is available; use "+-NNNN" instead. */
1329 int am = (offset < 0 ? -offset : offset) / 60; 1329 int am = (offset < 0 ? -offset : offset) / 60;
1330 qxesprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60, 1330 qxesprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60,
1331 am%60); 1331 am%60);
1332 tem = build_intstring (buf); 1332 tem = build_istring (buf);
1333 } 1333 }
1334 return list2 (make_int (offset), tem); 1334 return list2 (make_int (offset), tem);
1335 } 1335 }
1336 else 1336 else
1337 return list2 (Qnil, Qnil); 1337 return list2 (Qnil, Qnil);