Mercurial > hg > xemacs-beta

comparison src/text.h @ 4981:4aebb0131297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends -------------------- ChangeLog entries follow: -------------------- modules/ChangeLog addition: 2010-02-05 Ben Wing <ben@xemacs.org> * postgresql/postgresql.c: * postgresql/postgresql.c (CHECK_LIVE_CONNECTION): * postgresql/postgresql.c (Fpq_connectdb): * postgresql/postgresql.c (Fpq_connect_start): * postgresql/postgresql.c (Fpq_lo_import): * postgresql/postgresql.c (Fpq_lo_export): * ldap/eldap.c (Fldap_open): * ldap/eldap.c (Fldap_search_basic): * ldap/eldap.c (Fldap_add): * ldap/eldap.c (Fldap_modify): * ldap/eldap.c (Fldap_delete): * canna/canna_api.c (Fcanna_initialize): * canna/canna_api.c (Fcanna_store_yomi): * canna/canna_api.c (Fcanna_parse): * canna/canna_api.c (Fcanna_henkan_begin): EXTERNAL_TO_C_STRING returns its argument instead of storing it in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar things happen to related macros. See entry in src/ChangeLog. More Mule-izing of postgresql.c. Extract out common code between `pq-connectdb' and `pq-connect-start'. Fix places that signal an error string using a formatted string to instead follow the standard and have a fixed reason followed by the particular error message stored as one of the frobs. src/ChangeLog addition: 2010-02-05 Ben Wing <ben@xemacs.org> * console-msw.c (write_string_to_mswindows_debugging_output): * console-msw.c (Fmswindows_message_box): * console-x.c (x_perhaps_init_unseen_key_defaults): * console.c: * database.c (dbm_get): * database.c (dbm_put): * database.c (dbm_remove): * database.c (berkdb_get): * database.c (berkdb_put): * database.c (berkdb_remove): * database.c (Fopen_database): * device-gtk.c (gtk_init_device): * device-msw.c (msprinter_init_device_internal): * device-msw.c (msprinter_default_printer): * device-msw.c (msprinter_init_device): * device-msw.c (sync_printer_with_devmode): * device-msw.c (Fmsprinter_select_settings): * device-x.c (sanity_check_geometry_resource): * device-x.c (Dynarr_add_validified_lisp_string): * device-x.c (x_init_device): * device-x.c (Fx_put_resource): * device-x.c (Fx_valid_keysym_name_p): * device-x.c (Fx_set_font_path): * dialog-msw.c (push_lisp_string_as_unicode): * dialog-msw.c (handle_directory_dialog_box): * dialog-msw.c (handle_file_dialog_box): * dialog-x.c (dbox_descriptor_to_widget_value): * editfns.c (Fformat_time_string): * editfns.c (Fencode_time): * editfns.c (Fset_time_zone_rule): * emacs.c (make_argc_argv): * emacs.c (Fdump_emacs): * emodules.c (emodules_load): * eval.c: * eval.c (maybe_signal_error_1): * event-msw.c (Fdde_alloc_advise_item): * event-msw.c (mswindows_dde_callback): * event-msw.c (mswindows_wnd_proc): * fileio.c (report_error_with_errno): * fileio.c (Fsysnetunam): * fileio.c (Fdo_auto_save): * font-mgr.c (extract_fcapi_string): * font-mgr.c (Ffc_config_app_font_add_file): * font-mgr.c (Ffc_config_app_font_add_dir): * font-mgr.c (Ffc_config_filename): * frame-gtk.c (gtk_set_frame_text_value): * frame-gtk.c (gtk_create_widgets): * frame-msw.c (mswindows_init_frame_1): * frame-msw.c (mswindows_set_title_from_ibyte): * frame-msw.c (msprinter_init_frame_3): * frame-x.c (x_set_frame_text_value): * frame-x.c (x_set_frame_properties): * frame-x.c (start_drag_internal_1): * frame-x.c (x_cde_transfer_callback): * frame-x.c (x_create_widgets): * glyphs-eimage.c (my_jpeg_output_message): * glyphs-eimage.c (jpeg_instantiate): * glyphs-eimage.c (gif_instantiate): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate): * glyphs-gtk.c (xbm_instantiate_1): * glyphs-gtk.c (gtk_xbm_instantiate): * glyphs-gtk.c (gtk_xpm_instantiate): * glyphs-gtk.c (gtk_xface_instantiate): * glyphs-gtk.c (cursor_font_instantiate): * glyphs-gtk.c (gtk_redisplay_widget): * glyphs-gtk.c (gtk_widget_instantiate_1): * glyphs-gtk.c (gtk_add_tab_item): * glyphs-msw.c (mswindows_xpm_instantiate): * glyphs-msw.c (bmp_instantiate): * glyphs-msw.c (mswindows_resource_instantiate): * glyphs-msw.c (xbm_instantiate_1): * glyphs-msw.c (mswindows_xbm_instantiate): * glyphs-msw.c (mswindows_xface_instantiate): * glyphs-msw.c (mswindows_redisplay_widget): * glyphs-msw.c (mswindows_widget_instantiate): * glyphs-msw.c (add_tree_item): * glyphs-msw.c (add_tab_item): * glyphs-msw.c (mswindows_combo_box_instantiate): * glyphs-msw.c (mswindows_widget_query_string_geometry): * glyphs-x.c (x_locate_pixmap_file): * glyphs-x.c (xbm_instantiate_1): * glyphs-x.c (x_xbm_instantiate): * glyphs-x.c (extract_xpm_color_names): * glyphs-x.c (x_xpm_instantiate): * glyphs-x.c (x_xface_instantiate): * glyphs-x.c (autodetect_instantiate): * glyphs-x.c (safe_XLoadFont): * glyphs-x.c (cursor_font_instantiate): * glyphs-x.c (x_redisplay_widget): * glyphs-x.c (Fchange_subwindow_property): * glyphs-x.c (x_widget_instantiate): * glyphs-x.c (x_tab_control_redisplay): * glyphs.c (pixmap_to_lisp_data): * gui-x.c (menu_separator_style_and_to_external): * gui-x.c (add_accel_and_to_external): * gui-x.c (button_item_to_widget_value): * hpplay.c (player_error_internal): * hpplay.c (play_sound_file): * hpplay.c (play_sound_data): * intl.c (Fset_current_locale): * lisp.h: * menubar-gtk.c (gtk_xemacs_set_accel_keys): * menubar-msw.c (populate_menu_add_item): * menubar-msw.c (populate_or_checksum_helper): * menubar-x.c (menu_item_descriptor_to_widget_value_1): * nt.c (init_user_info): * nt.c (get_long_basename): * nt.c (nt_get_resource): * nt.c (init_mswindows_environment): * nt.c (get_cached_volume_information): * nt.c (mswindows_readdir): * nt.c (read_unc_volume): * nt.c (mswindows_stat): * nt.c (mswindows_getdcwd): * nt.c (mswindows_executable_type): * nt.c (Fmswindows_short_file_name): * ntplay.c (nt_play_sound_file): * objects-gtk.c: * objects-gtk.c (gtk_valid_color_name_p): * objects-gtk.c (gtk_initialize_font_instance): * objects-gtk.c (gtk_font_list): * objects-msw.c (font_enum_callback_2): * objects-msw.c (parse_font_spec): * objects-x.c (x_parse_nearest_color): * objects-x.c (x_valid_color_name_p): * objects-x.c (x_initialize_font_instance): * objects-x.c (x_font_instance_truename): * objects-x.c (x_font_list): * objects-xlike-inc.c (XFUN): * objects-xlike-inc.c (xft_find_charset_font): * process-nt.c (mswindows_report_winsock_error): * process-nt.c (nt_create_process): * process-nt.c (get_internet_address): * process-nt.c (nt_open_network_stream): * process-unix.c: * process-unix.c (allocate_pty): * process-unix.c (get_internet_address): * process-unix.c (unix_canonicalize_host_name): * process-unix.c (unix_open_network_stream): * realpath.c: * select-common.h (lisp_data_to_selection_data): * select-gtk.c (symbol_to_gtk_atom): * select-gtk.c (atom_to_symbol): * select-msw.c (symbol_to_ms_cf): * select-msw.c (mswindows_register_selection_data_type): * select-x.c (symbol_to_x_atom): * select-x.c (x_atom_to_symbol): * select-x.c (hack_motif_clipboard_selection): * select-x.c (Fx_store_cutbuffer_internal): * sound.c (Fplay_sound_file): * sound.c (Fplay_sound): * sound.h (sound_perror): * sysdep.c: * sysdep.c (qxe_allocating_getcwd): * sysdep.c (qxe_execve): * sysdep.c (copy_in_passwd): * sysdep.c (qxe_getpwnam): * sysdep.c (qxe_ctime): * sysdll.c (dll_open): * sysdll.c (dll_function): * sysdll.c (dll_variable): * sysdll.c (search_linked_libs): * sysdll.c (dll_error): * sysfile.h: * sysfile.h (PATHNAME_CONVERT_OUT_TSTR): * sysfile.h (PATHNAME_CONVERT_OUT_UTF_8): * sysfile.h (PATHNAME_CONVERT_OUT): * sysfile.h (LISP_PATHNAME_CONVERT_OUT): * syswindows.h (ITEXT_TO_TSTR): * syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR): * syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT): * syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN): * syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR): * text.h: * text.h (eicpy_ext_len): * text.h (enum new_dfc_src_type): * text.h (EXTERNAL_TO_ITEXT): * text.h (GET_STRERROR): * tooltalk.c (check_status): * tooltalk.c (Fadd_tooltalk_message_arg): * tooltalk.c (Fadd_tooltalk_pattern_attribute): * tooltalk.c (Fadd_tooltalk_pattern_arg): * win32.c (tstr_to_local_file_format): * win32.c (mswindows_lisp_error_1): * win32.c (mswindows_report_process_error): * win32.c (Fmswindows_shell_execute): * win32.c (mswindows_read_link_1): Changes involving external/internal format conversion, mostly code cleanup and renaming. 1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL that stored its result in a parameter. The new version of LISP_STRING_TO_EXTERNAL returns its result through the return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL. Use the new-style macros throughout the code. 2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL, in keeping with overall naming rationalization involving Itext and related types. Macros involved in previous two: EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC LISP_STRING_TO_EXTERNAL LISP_STRING_TO_EXTERNAL_MALLOC LISP_STRING_TO_TSTR C_STRING_TO_TSTR -> ITEXT_TO_TSTR TSTR_TO_C_STRING -> TSTR_TO_ITEXT The following four still return their values through parameters, since they have more than one value to return: C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL LISP_STRING_TO_SIZED_EXTERNAL C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC LISP_STRING_TO_SIZED_EXTERNAL_MALLOC Sometimes additional casts had to be inserted, since the old macros played strange games and completely defeated the type system of the store params. 3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT occurred with calls to one of the convenience macros listed above, or to make_extstring(). 4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway) and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT. 4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something like LISP_STRING_TO_EXTERNAL(..., Qfile_name). 5. Eliminate some temporary variables that are no longer necessary now that we return a value rather than storing it into a variable. 6. Some Mule-izing in database.c. 7. Error functions: -- A bit of code cleanup in maybe_signal_error_1. -- Eliminate report_file_type_error; it's just an alias for signal_error_2 with params in a different order. -- Fix some places in the hostname-handling code that directly inserted externally-retrieved error strings into the supposed ASCII "reason" param instead of doing the right thing and sticking text descriptive of what was going on in "reason" and putting the external message in a frob. 8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one or two other places. 9. Some code cleanup in copy_in_passwd() in sysdep.c. 10. Fix a real bug due to accidental variable shadowing in tstr_to_local_file_format() in win32.c.
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:02:24 -0600
parents 304aebb79cd3
children 3c3c1d139863
comparison
equal deleted inserted replaced
4972:c448f4c38d65 4981:4aebb0131297
1934 \ 1934 \
1935 ASSERT_ASCTEXT_ASCII_LEN (ei6, ei6len); \ 1935 ASSERT_ASCTEXT_ASCII_LEN (ei6, ei6len); \
1936 eicpy_ext_len (ei, ei6, ei6len, Qbinary); \ 1936 eicpy_ext_len (ei, ei6, ei6len, Qbinary); \
1937 } while (0) 1937 } while (0)
1938 1938
1939 #define eicpy_ext_len(ei, extdata, extlen, codesys) \ 1939 #define eicpy_ext_len(ei, extdata, extlen, codesys) \
1940 do { \ 1940 do { \
1941 const Extbyte *ei7 = (extdata); \ 1941 const Extbyte *ei7 = (extdata); \
1942 int ei7len = (extlen); \ 1942 int ei7len = (extlen); \
1943 \ 1943 \
1944 SIZED_EXTERNAL_TO_SIZED_C_STRING (ei7, ei7len, (ei)->data_, \ 1944 TO_INTERNAL_FORMAT (DATA, (ei7, ei7len), \
1945 (ei)->bytelen_, codesys); \ 1945 ALLOCA, ((ei)->data_, (ei)->bytelen_), \
1946 (ei)->max_size_allocated_ = (ei)->bytelen_ + 1; \ 1946 codesys); \
1947 (ei)->max_size_allocated_ = (ei)->bytelen_ + 1; \
1947 (ei)->charlen_ = bytecount_to_charcount ((ei)->data_, (ei)->bytelen_); \ 1948 (ei)->charlen_ = bytecount_to_charcount ((ei)->data_, (ei)->bytelen_); \
1948 } while (0) 1949 } while (0)
1949 1950
1950 #define eicpy_ext(ei, extdata, codesys) \ 1951 #define eicpy_ext(ei, extdata, codesys) \
1951 do { \ 1952 do { \
2809 sink = make_opaque (dfc_sink.data.ptr, dfc_sink.data.len) 2810 sink = make_opaque (dfc_sink.data.ptr, dfc_sink.data.len)
2810 #define DFC_LISP_LSTREAM_USE_CONVERTED_DATA(sink) /* data already used */ 2811 #define DFC_LISP_LSTREAM_USE_CONVERTED_DATA(sink) /* data already used */
2811 #define DFC_LISP_BUFFER_USE_CONVERTED_DATA(sink) \ 2812 #define DFC_LISP_BUFFER_USE_CONVERTED_DATA(sink) \
2812 Lstream_delete (XLSTREAM (dfc_sink.lisp_object)) 2813 Lstream_delete (XLSTREAM (dfc_sink.lisp_object))
2813 2814
2814 /* #define TEST_NEW_DFC */
2815
2816 /* Convenience macros for extremely common invocations */
2817 #ifdef TEST_NEW_DFC
2818 #define C_STRING_TO_EXTERNAL(in, out, codesys) \
2819 do { * (Extbyte **) &(out) = \
2820 NEW_C_STRING_TO_EXTERNAL (in, codesys); } while (0)
2821 #define SIZED_C_STRING_TO_EXTERNAL(in, inlen, out, codesys) \
2822 do { * (Extbyte **) &(out) = \
2823 NEW_SIZED_C_STRING_TO_EXTERNAL (in, inlen, codesys); } while (0)
2824 #define EXTERNAL_TO_C_STRING(in, out, codesys) \
2825 do { * (Ibyte **) &(out) = \
2826 NEW_EXTERNAL_TO_C_STRING (in, codesys); } while (0)
2827 #define SIZED_EXTERNAL_TO_C_STRING(in, inlen, out, codesys) \
2828 do { * (Ibyte **) &(out) = \
2829 NEW_SIZED_EXTERNAL_TO_C_STRING (in, inlen, codesys); } while (0)
2830 #define LISP_STRING_TO_EXTERNAL(in, out, codesys) \
2831 do { * (Extbyte **) &(out) = \
2832 NEW_LISP_STRING_TO_EXTERNAL (in, codesys); } while (0)
2833 #else
2834 #define C_STRING_TO_EXTERNAL(in, out, codesys) \
2835 TO_EXTERNAL_FORMAT (C_STRING, in, C_STRING_ALLOCA, out, codesys)
2836 #define SIZED_C_STRING_TO_EXTERNAL(in, inlen, out, codesys) \
2837 TO_EXTERNAL_FORMAT (DATA, (in, inlen), C_STRING_ALLOCA, out, codesys)
2838 #define EXTERNAL_TO_C_STRING(in, out, codesys) \
2839 TO_INTERNAL_FORMAT (C_STRING, in, C_STRING_ALLOCA, out, codesys)
2840 #define SIZED_EXTERNAL_TO_C_STRING(in, inlen, out, codesys) \
2841 TO_INTERNAL_FORMAT (DATA, (in, inlen), C_STRING_ALLOCA, out, codesys)
2842 #define LISP_STRING_TO_EXTERNAL(in, out, codesys) \
2843 TO_EXTERNAL_FORMAT (LISP_STRING, in, C_STRING_ALLOCA, out, codesys)
2844 #endif /* TEST_NEW_DFC */
2845
2846 #define C_STRING_TO_SIZED_EXTERNAL(in, out, outlen, codesys) \
2847 TO_EXTERNAL_FORMAT (C_STRING, in, ALLOCA, (out, outlen), codesys)
2848 #define SIZED_C_STRING_TO_SIZED_EXTERNAL(in, inlen, out, outlen, codesys) \
2849 TO_EXTERNAL_FORMAT (DATA, (in, inlen), ALLOCA, (out, outlen), codesys)
2850 #define EXTERNAL_TO_SIZED_C_STRING(in, out, outlen, codesys) \
2851 TO_INTERNAL_FORMAT (C_STRING, in, ALLOCA, (out, outlen), codesys)
2852 #define SIZED_EXTERNAL_TO_SIZED_C_STRING(in, inlen, out, outlen, codesys) \
2853 TO_INTERNAL_FORMAT (DATA, (in, inlen), ALLOCA, (out, outlen), codesys)
2854 #define LISP_STRING_TO_SIZED_EXTERNAL(in, out, outlen, codesys) \
2855 TO_EXTERNAL_FORMAT (LISP_STRING, in, ALLOCA, (out, outlen), codesys)
2856
2857 /* In place of EXTERNAL_TO_LISP_STRING(), use build_extstring() and/or
2858 make_extstring(). */
2859
2860 #ifdef TEST_NEW_DFC
2861 #define C_STRING_TO_EXTERNAL_MALLOC(in, out, codesys) \
2862 do { * (Extbyte **) &(out) = \
2863 NEW_C_STRING_TO_EXTERNAL_MALLOC (in, codesys); } while (0)
2864 #define SIZED_C_STRING_TO_EXTERNAL_MALLOC(in, inlen, out, codesys) \
2865 do { * (Extbyte **) &(out) = \
2866 NEW_SIZED_C_STRING_TO_EXTERNAL_MALLOC (in, inlen, codesys); } \
2867 while (0)
2868 #define EXTERNAL_TO_C_STRING_MALLOC(in, out, codesys) \
2869 do { * (Ibyte **) &(out) = \
2870 NEW_EXTERNAL_TO_C_STRING_MALLOC (in, codesys); } while (0)
2871 #define SIZED_EXTERNAL_TO_C_STRING_MALLOC(in, inlen, out, codesys) \
2872 do { * (Ibyte **) &(out) = \
2873 NEW_SIZED_EXTERNAL_TO_C_STRING_MALLOC (in, inlen, codesys); } \
2874 while (0)
2875 #define LISP_STRING_TO_EXTERNAL_MALLOC(in, out, codesys) \
2876 do { * (Extbyte **) &(out) = \
2877 NEW_LISP_STRING_TO_EXTERNAL_MALLOC (in, codesys); } while (0)
2878 #else
2879 #define C_STRING_TO_EXTERNAL_MALLOC(in, out, codesys) \
2880 TO_EXTERNAL_FORMAT (C_STRING, in, C_STRING_MALLOC, out, codesys)
2881 #define SIZED_C_STRING_TO_EXTERNAL_MALLOC(in, inlen, out, codesys) \
2882 TO_EXTERNAL_FORMAT (DATA, (in, inlen), C_STRING_MALLOC, out, codesys)
2883 #define EXTERNAL_TO_C_STRING_MALLOC(in, out, codesys) \
2884 TO_INTERNAL_FORMAT (C_STRING, in, C_STRING_MALLOC, out, codesys)
2885 #define SIZED_EXTERNAL_TO_C_STRING_MALLOC(in, inlen, out, codesys) \
2886 TO_INTERNAL_FORMAT (DATA, (in, inlen), C_STRING_MALLOC, out, codesys)
2887 #define LISP_STRING_TO_EXTERNAL_MALLOC(in, out, codesys) \
2888 TO_EXTERNAL_FORMAT (LISP_STRING, in, C_STRING_MALLOC, out, codesys)
2889 #endif /* TEST_NEW_DFC */
2890
2891 #define C_STRING_TO_SIZED_EXTERNAL_MALLOC(in, out, outlen, codesys) \
2892 TO_EXTERNAL_FORMAT (C_STRING, in, MALLOC, (out, outlen), codesys)
2893 #define SIZED_C_STRING_TO_SIZED_EXTERNAL_MALLOC(in, inlen, out, outlen, \
2894 codesys) \
2895 TO_EXTERNAL_FORMAT (DATA, (in, inlen), MALLOC, (out, outlen), codesys)
2896 #define EXTERNAL_TO_SIZED_C_STRING_MALLOC(in, out, outlen, codesys) \
2897 TO_INTERNAL_FORMAT (C_STRING, in, MALLOC, (out, outlen), codesys)
2898 #define SIZED_EXTERNAL_TO_SIZED_C_STRING_MALLOC(in, inlen, out, outlen, \
2899 codesys) \
2900 TO_INTERNAL_FORMAT (DATA, (in, inlen), MALLOC, (out, outlen), codesys)
2901 #define LISP_STRING_TO_SIZED_EXTERNAL_MALLOC(in, out, outlen, codesys) \
2902 TO_EXTERNAL_FORMAT (LISP_STRING, in, MALLOC, (out, outlen), codesys)
2903
2904 enum new_dfc_src_type 2815 enum new_dfc_src_type
2905 { 2816 {
2906 DFC_EXTERNAL, 2817 DFC_EXTERNAL,
2907 DFC_SIZED_EXTERNAL, 2818 DFC_SIZED_EXTERNAL,
2908 DFC_INTERNAL, 2819 DFC_INTERNAL,
2921 MODULE_API void *new_dfc_convert_copy_data (const char *srctext, 2832 MODULE_API void *new_dfc_convert_copy_data (const char *srctext,
2922 void *alloca_data); 2833 void *alloca_data);
2923 2834
2924 END_C_DECLS 2835 END_C_DECLS
2925 2836
2926 /* Version of EXTERNAL_TO_C_STRING that *RETURNS* the translated string, 2837 /* Version of EXTERNAL_TO_ITEXT that *RETURNS* the translated string,
2927 still in alloca() space. Requires some trickiness to do this, but gets 2838 still in alloca() space. Requires some trickiness to do this, but gets
2928 it done! */ 2839 it done! */
2929 2840
2930 /* NOTE: If you make two invocations of the dfc functions below in the same 2841 /* NOTE: If you make two invocations of the dfc functions below in the same
2931 subexpression and use the exact same expression for the source in both 2842 subexpression and use the exact same expression for the source in both
2943 #define NEW_DFC_CONVERT_1_ALLOCA(src, src_size, type, codesys) \ 2854 #define NEW_DFC_CONVERT_1_ALLOCA(src, src_size, type, codesys) \
2944 new_dfc_convert_copy_data \ 2855 new_dfc_convert_copy_data \
2945 (#src, ALLOCA_FUNCALL_OK (new_dfc_convert_size (#src, src, src_size, \ 2856 (#src, ALLOCA_FUNCALL_OK (new_dfc_convert_size (#src, src, src_size, \
2946 type, codesys))) 2857 type, codesys)))
2947 2858
2948 #define NEW_EXTERNAL_TO_C_STRING(src, codesys) \ 2859 #define EXTERNAL_TO_ITEXT(src, codesys) \
2949 (Ibyte *) NEW_DFC_CONVERT_1_ALLOCA (src, -1, DFC_EXTERNAL, codesys) 2860 ((Ibyte *) NEW_DFC_CONVERT_1_ALLOCA (src, -1, DFC_EXTERNAL, codesys))
2950 #define NEW_EXTERNAL_TO_C_STRING_MALLOC(src, codesys) \ 2861 #define EXTERNAL_TO_ITEXT_MALLOC(src, codesys) \
2951 (Ibyte *) new_dfc_convert_malloc (src, -1, DFC_EXTERNAL, codesys) 2862 ((Ibyte *) new_dfc_convert_malloc (src, -1, DFC_EXTERNAL, codesys))
2952 #define NEW_SIZED_EXTERNAL_TO_C_STRING(src, len, codesys) \ 2863 #define SIZED_EXTERNAL_TO_ITEXT(src, len, codesys) \
2953 (Ibyte *) NEW_DFC_CONVERT_1_ALLOCA (src, len, DFC_SIZED_EXTERNAL, codesys) 2864 ((Ibyte *) NEW_DFC_CONVERT_1_ALLOCA (src, len, DFC_SIZED_EXTERNAL, codesys))
2954 #define NEW_SIZED_EXTERNAL_TO_C_STRING_MALLOC(src, len, codesys) \ 2865 #define SIZED_EXTERNAL_TO_ITEXT_MALLOC(src, len, codesys) \
2955 (Ibyte *) new_dfc_convert_malloc (src, len, DFC_SIZED_EXTERNAL, codesys) 2866 ((Ibyte *) new_dfc_convert_malloc (src, len, DFC_SIZED_EXTERNAL, codesys))
2956 #define NEW_C_STRING_TO_EXTERNAL(src, codesys) \ 2867 #define ITEXT_TO_EXTERNAL(src, codesys) \
2957 (Extbyte *) NEW_DFC_CONVERT_1_ALLOCA (src, -1, DFC_INTERNAL, codesys) 2868 ((Extbyte *) NEW_DFC_CONVERT_1_ALLOCA (src, -1, DFC_INTERNAL, codesys))
2958 #define NEW_C_STRING_TO_EXTERNAL_MALLOC(src, codesys) \ 2869 #define ITEXT_TO_EXTERNAL_MALLOC(src, codesys) \
2959 (Extbyte *) new_dfc_convert_malloc (src, -1, DFC_INTERNAL, codesys) 2870 ((Extbyte *) new_dfc_convert_malloc (src, -1, DFC_INTERNAL, codesys))
2960 #define NEW_SIZED_C_STRING_TO_EXTERNAL(src, len, codesys) \ 2871 #define LISP_STRING_TO_EXTERNAL(src, codesys) \
2961 (Extbyte *) NEW_DFC_CONVERT_1_ALLOCA (src, len, DFC_SIZED_INTERNAL, codesys) 2872 ((Extbyte *) NEW_DFC_CONVERT_1_ALLOCA (LISP_TO_VOID (src), -1, \
2962 #define NEW_SIZED_C_STRING_TO_EXTERNAL_MALLOC(src, len, codesys) \ 2873 DFC_LISP_STRING, codesys))
2963 (Extbyte *) new_dfc_convert_malloc (src, len, DFC_SIZED_INTERNAL, codesys) 2874 #define LISP_STRING_TO_EXTERNAL_MALLOC(src, codesys) \
2964 #define NEW_LISP_STRING_TO_EXTERNAL(src, codesys) \ 2875 ((Extbyte *) new_dfc_convert_malloc (LISP_TO_VOID (src), -1, \
2965 (Extbyte *) NEW_DFC_CONVERT_1_ALLOCA (LISP_TO_VOID (src), -1, \ 2876 DFC_LISP_STRING, codesys))
2966 DFC_LISP_STRING, codesys) 2877 /* In place of EXTERNAL_TO_LISP_STRING(), use build_extstring() and/or
2967 #define NEW_LISP_STRING_TO_EXTERNAL_MALLOC(src, codesys) \ 2878 make_extstring(). */
2968 (Extbyte *) new_dfc_convert_malloc (LISP_TO_VOID (src), -1, \ 2879
2969 DFC_LISP_STRING, codesys) 2880 /* The next four have two outputs, so we make both of them be parameters */
2881 #define ITEXT_TO_SIZED_EXTERNAL(in, out, outlen, codesys) \
2882 TO_EXTERNAL_FORMAT (C_STRING, in, ALLOCA, (out, outlen), codesys)
2883 #define LISP_STRING_TO_SIZED_EXTERNAL(in, out, outlen, codesys) \
2884 TO_EXTERNAL_FORMAT (LISP_STRING, in, ALLOCA, (out, outlen), codesys)
2885 #define ITEXT_TO_SIZED_EXTERNAL_MALLOC(in, out, outlen, codesys) \
2886 TO_EXTERNAL_FORMAT (C_STRING, in, MALLOC, (out, outlen), codesys)
2887 #define LISP_STRING_TO_SIZED_EXTERNAL_MALLOC(in, out, outlen, codesys) \
2888 TO_EXTERNAL_FORMAT (LISP_STRING, in, MALLOC, (out, outlen), codesys)
2970 2889
2971 /* Wexttext functions. The type of Wexttext is selected at compile time 2890 /* Wexttext functions. The type of Wexttext is selected at compile time
2972 and will sometimes be wchar_t, sometimes char. */ 2891 and will sometimes be wchar_t, sometimes char. */
2973 2892
2974 int wcscmp_ascii (const wchar_t *s1, const Ascbyte *s2); 2893 int wcscmp_ascii (const wchar_t *s1, const Ascbyte *s2);
3144 int __gsnum__ = (num); \ 3063 int __gsnum__ = (num); \
3145 Extbyte * __gserr__ = strerror (__gsnum__); \ 3064 Extbyte * __gserr__ = strerror (__gsnum__); \
3146 \ 3065 \
3147 if (!__gserr__) \ 3066 if (!__gserr__) \
3148 { \ 3067 { \
3149 var = alloca_ibytes (99); \ 3068 var = alloca_ibytes (99); \
3150 qxesprintf (var, "Unknown error %d", __gsnum__); \ 3069 qxesprintf (var, "Unknown error %d", __gsnum__); \
3151 } \ 3070 } \
3152 else \ 3071 else \
3153 EXTERNAL_TO_C_STRING (__gserr__, var, Qstrerror_encoding); \ 3072 var = EXTERNAL_TO_ITEXT (__gserr__, Qstrerror_encoding); \
3154 } while (0) 3073 } while (0)
3155 3074
3156 #endif /* INCLUDED_text_h_ */ 3075 #endif /* INCLUDED_text_h_ */