Mercurial > hg > xemacs-beta
annotate lib-src/getopt1.c @ 4953:304aebb79cd3
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 | 84b14dcb0985 |
| children | 061f4f90f874 |
| rev | line source |
|---|---|
| 428 | 1 /* getopt_long and getopt_long_only entry points for GNU getopt. |
| 2 Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc. | |
| 3 | |
| 4 NOTE: The canonical source of this file is maintained with the GNU C Library. | |
| 5 Bugs can be reported to bug-glibc@prep.ai.mit.edu. | |
| 6 | |
| 7 This program is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 This program is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with this program; if not, write to the Free Software | |
| 19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | |
| 20 USA. */ | |
| 21 | |
| 22 #ifdef HAVE_CONFIG_H | |
| 438 | 23 #include <config.h> |
| 428 | 24 #endif |
| 25 | |
| 26 #include "getopt.h" | |
| 27 | |
| 28 #include <stdio.h> | |
| 29 | |
| 30 /* Comment out all this code if we are using the GNU C Library, and are not | |
| 31 actually compiling the library itself. This code is part of the GNU C | |
| 32 Library, but also included in many other GNU distributions. Compiling | |
| 33 and linking in this code is a waste when using the GNU C library | |
| 34 (especially if it is a shared library). Rather than having every GNU | |
| 35 program understand `configure --with-gnu-libc' and omit the object files, | |
| 36 it is simpler to just do this in the source for each such file. */ | |
| 37 | |
| 38 #define GETOPT_INTERFACE_VERSION 2 | |
| 39 #if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2 | |
| 40 #include <gnu-versions.h> | |
| 41 #if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION | |
| 42 #define ELIDE_CODE | |
| 43 #endif | |
| 44 #endif | |
| 45 | |
| 46 #ifndef ELIDE_CODE | |
| 47 | |
| 48 | |
| 49 /* This needs to come after some library #include | |
| 50 to get __GNU_LIBRARY__ defined. */ | |
| 51 #ifdef __GNU_LIBRARY__ | |
| 52 #include <stdlib.h> | |
| 53 #endif | |
| 54 | |
| 55 #ifndef NULL | |
| 56 #define NULL 0 | |
| 57 #endif | |
| 58 | |
| 59 int | |
| 60 getopt_long (int argc, char *const *argv, const char *options, | |
| 61 const struct option *long_options, int *opt_index) | |
| 62 { | |
| 63 return _getopt_internal (argc, argv, options, long_options, opt_index, 0); | |
| 64 } | |
| 65 | |
| 66 /* Like getopt_long, but '-' as well as '--' can indicate a long option. | |
| 67 If an option that starts with '-' (not '--') doesn't match a long option, | |
| 68 but does match a short option, it is parsed as a short option | |
| 69 instead. */ | |
| 70 | |
| 71 int | |
| 72 getopt_long_only (int argc, char *const *argv, const char *options, | |
| 73 const struct option *long_options, int *opt_index) | |
| 74 { | |
| 75 return _getopt_internal (argc, argv, options, long_options, opt_index, 1); | |
| 76 } | |
| 77 | |
| 78 | |
| 79 #endif /* Not ELIDE_CODE. */ | |
| 80 | |
| 81 #ifdef TEST | |
| 82 | |
| 83 #include <stdio.h> | |
| 84 | |
| 85 int | |
| 86 main (int argc, char **argv) | |
| 87 { | |
| 88 int c; | |
| 89 int digit_optind = 0; | |
| 90 | |
| 91 while (1) | |
| 92 { | |
| 93 int this_option_optind = optind ? optind : 1; | |
| 94 int option_index = 0; | |
| 95 static struct option long_options[] = | |
| 96 { | |
| 97 {"add", 1, 0, 0}, | |
| 98 {"append", 0, 0, 0}, | |
| 99 {"delete", 1, 0, 0}, | |
| 100 {"verbose", 0, 0, 0}, | |
| 101 {"create", 0, 0, 0}, | |
| 102 {"file", 1, 0, 0}, | |
| 103 {0, 0, 0, 0} | |
| 104 }; | |
| 105 | |
| 106 c = getopt_long (argc, argv, "abc:d:0123456789", | |
| 107 long_options, &option_index); | |
| 108 if (c == -1) | |
| 109 break; | |
| 110 | |
| 111 switch (c) | |
| 112 { | |
| 113 case 0: | |
| 114 printf ("option %s", long_options[option_index].name); | |
| 115 if (optarg) | |
| 116 printf (" with arg %s", optarg); | |
| 117 printf ("\n"); | |
| 118 break; | |
| 119 | |
| 120 case '0': | |
| 121 case '1': | |
| 122 case '2': | |
| 123 case '3': | |
| 124 case '4': | |
| 125 case '5': | |
| 126 case '6': | |
| 127 case '7': | |
| 128 case '8': | |
| 129 case '9': | |
| 130 if (digit_optind != 0 && digit_optind != this_option_optind) | |
| 131 printf ("digits occur in two different argv-elements.\n"); | |
| 132 digit_optind = this_option_optind; | |
| 133 printf ("option %c\n", c); | |
| 134 break; | |
| 135 | |
| 136 case 'a': | |
| 137 printf ("option a\n"); | |
| 138 break; | |
| 139 | |
| 140 case 'b': | |
| 141 printf ("option b\n"); | |
| 142 break; | |
| 143 | |
| 144 case 'c': | |
| 145 printf ("option c with value `%s'\n", optarg); | |
| 146 break; | |
| 147 | |
| 148 case 'd': | |
| 149 printf ("option d with value `%s'\n", optarg); | |
| 150 break; | |
| 151 | |
| 152 case '?': | |
| 153 break; | |
| 154 | |
| 155 default: | |
| 156 printf ("?? getopt returned character code 0%o ??\n", c); | |
| 157 } | |
| 158 } | |
| 159 | |
| 160 if (optind < argc) | |
| 161 { | |
| 162 printf ("non-option ARGV-elements: "); | |
| 163 while (optind < argc) | |
| 164 printf ("%s ", argv[optind++]); | |
| 165 printf ("\n"); | |
| 166 } | |
| 167 | |
| 168 exit (0); | |
| 169 } | |
| 170 | |
| 171 #endif /* TEST */ |