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.

## Copyright (c) 2000, Red Hat, Inc.
## Copyright (C) 2005 Ben Wing.
##
##     This program is free software; you can redistribute it and/or modify
##     it under the terms of the GNU General Public License as published by
##     the Free Software Foundation; either version 2 of the License, or
##     (at your option) any later version.
##
##     A copy of the GNU General Public License can be found at
##     http://www.gnu.org/
##
## Written by Christopher Faylor <cgf@redhat.com>
## Adapted for XEmacs by Andy Piper <andy@xemacs.org>
##
## Makefile for Cygwin installer

## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .cc .h .o
## ==================== Things "configure" will edit ====================

@SET_MAKE@
SHELL = /bin/sh
RM = rm -f
pwd = /bin/pwd

CC=@CC@
CPP=@CPP@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
ALLOCA=@ALLOCA@
LN_S=@LN_S@
version=@version@

## This will be the name of the generated binary and is set automatically
## by configure.
PROGNAME=@PROGNAME@
INSTALLABLES=setup
#ifdef USE_GNU_MAKE
vpath %.c @srcdir@
vpath %.cc @srcdir@
vpath %.h @srcdir@
vpath %.l @srcdir@
vpath %.y @srcdir@
vpath %.rc @srcdir@
#else
VPATH=@srcdir@
#endif

## ==================== Where To Install Things ====================

prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
srcdir=@srcdir@
datarootdir=@datarootdir@
datadir=@datadir@
instvardir=@instvardir@
top_srcdir=@top_srcdir@
archlibdir=@archlibdir@
configuration=@configuration@
moduledir=@moduledir@
sitemoduledir=@sitemoduledir@
extra_includes=@extra_includes@
blddir=@blddir@

## ==================== Utility Programs for the Build =================

INSTALL = @install_pp@ @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
SHELL = @SHELL@
## ========================== Lists of Files ===========================

#define NO_SHORTNAMES
#define NOT_C_CODE
#include "../src/config.h"

program_transform_name = @program_transform_name@

CC		= @CC@
CC_FOR_TARGET	= $(CC)

## -O3 has problems so fix this locally
LOCALCFLAGS = $(CFLAGS) -O2 -DMINGW $(extra_includes)
CXXFLAGS	= $(LOCALCFLAGS) -fno-exceptions -nostdinc++ -fno-rtti

WINDRES		= windres
MINGW_INCLUDES	= -I. -I$(srcdir) 
MINGW_CXXFLAGS	= $(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
MINGW_CFLAGS	= $(LOCALCFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
MINGW_ZLIB_DIR	= /usr/local/lib

PROGS	= setup.exe
XEMACS=${blddir}/src/${PROGNAME}

CYGWIN_SIZE=0
WIN32_SIZE=0
KIT_VERSION=""

CONFIG_H = ../src/config.h

OBJS = \
	autoload.o \
	choose.o \
	concat.o \
	desktop.o \
	dialog.o \
	diskfull.o \
	download.o \
	find.o \
	fromcwd.o \
	geturl.o \
	hash.o \
	ini.o \
	inilex.o \
	iniparse.o \
	init.o \
	install.o \
	localdir.o \
	log.o \
	main.o \
	mkdir.o \
	mklink2.o \
	regedit.o \
	msg.o \
	net.o \
	netio.o \
	nio-ie5.o \
	nio-file.o \
	nio-ftp.o \
	nio-http.o \
	other.o \
	postinstall.o \
	res.o \
	root.o \
	simpsock.o \
	site.o \
	source.o \
	splash.o \
	state.o \
	tar.o \
	uninstall.o \
	version.o

.SUFFIXES:
.NOEXPORT:

.PHONY: all install

all: Makefile $(PROGS)

setup.exe: $(OBJS)
	$(CXX) $(MINGW_CXXFLAGS) -o $@ $(OBJS) \
		-lole32 -lwsock32 -lnetapi32 -ladvapi32 \
		-luuid -lkernel32 -luser32 \
		-L$(MINGW_ZLIB_DIR) -lz -lmingw32
	@chmod a-x $@

setup-bin.ini:
	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
	| sed -e 's/\$$Revision:* *//' -e 's/ *$$.*//'` ;\
	$(XEMACS) -batch -vanilla \
		-eval '(setq package-net-cygwin32-binary-size $(CYGWIN_SIZE) \
			package-net-win32-binary-size $(WIN32_SIZE) \
			package-net-kit-version "$(KIT_VERSION)" \
			package-net-setup-version "'$$V'")' \
		-l ${srcdir}/../lisp/package-net.el \
		-f package-net-batch-generate-bin-ini

install:
	@echo; echo "Installing net setup."
	for file in ${INSTALLABLES} ; do \
	  (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \
	done

version.c : $(srcdir)/ChangeLog Makefile
	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
	| sed -e 's/\$$Revision:* *//' \
	  -e 's/ *$$.*//'` ;\
	echo "char *version = \"$$V\";" > version.tmp ;\
	echo "static char *id = \"\\n%%% setup-version $$V\\n\";" >> version.tmp
	mv version.tmp version.c

%.o: %.rc
	$(WINDRES) --include-dir $(srcdir) -o $@ $<

%.o: %.c
	$(CC) $(MINGW_CFLAGS) -c -o $@ $<

%.o: %.cc
	$(CC) $(MINGW_CXXFLAGS) -c -o $@ $<

iniparse.c iniparse.h : iniparse.y
	bison -d -o iniparse.c $(srcdir)/iniparse.y

inilex.c : inilex.l iniparse.h
	flex -8 $(srcdir)/inilex.l
	mv lex.yy.c inilex.c

.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
	-$(RM) *.o *.i *.ini core
clean: mostlyclean
	-$(RM) $(PROGS)
distclean-noconfig: clean
	-$(RM) TAGS
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
	-$(RM) GNUmakefile Makefile Makefile.in
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
	-$(RM) *~ \#*
extraclean: realclean
	-$(RM) *~ \#*

choose.o: choose.cc win32.h dialog.h resource.h state.h ini.h concat.h \
 msg.h log.h find.h reginfo.h
concat.o: concat.cc
desktop.o: desktop.cc win32.h resource.h ini.h msg.h state.h concat.h \
 mkdir.h dialog.h version.h port.h reginfo.h desktop.h
dialog.o: dialog.cc win32.h dialog.h msg.h log.h
diskfull.o: diskfull.cc win32.h diskfull.h
download.o: download.cc win32.h resource.h msg.h ini.h dialog.h \
 concat.h geturl.h state.h mkdir.h log.h
find.o: find.cc win32.h port.h
fromcwd.o: fromcwd.cc win32.h ini.h resource.h concat.h state.h \
 dialog.h msg.h find.h version.h port.h
geturl.o: geturl.cc win32.h dialog.h \
 geturl.h resource.h netio.h msg.h log.h
hash.o: hash.cc hash.h
ini.o: ini.cc win32.h ini.h resource.h concat.h state.h geturl.h \
 dialog.h msg.h mkdir.h log.h reginfo.h version.h
inilex.o: inilex.c win32.h \
 ini.h \
 iniparse.h
iniparse.o: iniparse.c ini.h \
 iniparse.h \
 port.h
install.o: install.cc win32.h \
 resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
 diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h desktop.h
init.o: init.cc win32.h resource.h dialog.h state.h msg.h log.h 
uninstall.o: uninstall.cc win32.h \
 resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
 diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h desktop.h
localdir.o: localdir.cc win32.h dialog.h resource.h state.h msg.h \
 concat.h log.h
log.o: log.cc win32.h resource.h msg.h log.h dialog.h state.h concat.h \
 mkdir.h
main.o: main.cc win32.h resource.h dialog.h state.h msg.h netio.h \
 find.h log.h port.h
mkdir.o: mkdir.cc win32.h mkdir.h
mklink2.o: mklink2.c win32.h /usr/include/w32api/shlobj.h
msg.o: msg.cc win32.h dialog.h log.h
net.o: net.cc win32.h dialog.h resource.h state.h msg.h log.h
netio.o: netio.cc win32.h resource.h state.h msg.h netio.h nio-file.h \
 nio-ie5.h nio-http.h nio-ftp.h dialog.h log.h port.h
nio-file.o: nio-file.cc win32.h netio.h nio-file.h resource.h msg.h
nio-ftp.o: nio-ftp.cc win32.h resource.h state.h simpsock.h log.h \
 netio.h nio-ftp.h
nio-http.o: nio-http.cc win32.h resource.h state.h simpsock.h msg.h \
 netio.h nio-http.h
nio-ie5.o: nio-ie5.cc win32.h resource.h state.h dialog.h msg.h \
 netio.h nio-ie5.h
other.o: other.cc win32.h dialog.h resource.h state.h msg.h log.h
postinstall.o: postinstall.cc win32.h state.h dialog.h find.h concat.h \
 port.h
regedit.o: regedit.cc win32.h reginfo.h regedit.h msg.h resource.h \
 dialog.h
root.o: root.cc win32.h dialog.h resource.h state.h msg.h regedit.h \
 reginfo.h concat.h log.h
simpsock.o: simpsock.cc win32.h simpsock.h msg.h
site.o: site.cc win32.h dialog.h resource.h state.h geturl.h msg.h \
 concat.h regedit.h reginfo.h log.h port.h
source.o: source.cc win32.h dialog.h resource.h state.h msg.h log.h
splash.o: splash.cc win32.h dialog.h resource.h msg.h version.h
state.o: state.cc state.h
tar.o: tar.cc win32.h tar.h mkdir.h log.h port.h
version.o: version.c