Mercurial > hg > xemacs-beta
diff src/syswindows.h @ 867:804517e16990
[xemacs-hg @ 2002-06-05 09:54:39 by ben]
Textual renaming: text/char names
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization.
[a] distinguish between "charptr" when it refers to operations on
the pointer itself and when it refers to operations on text; and
[b] use consistent naming for everything referring to internal
format, i.e.
Itext == text in internal format
Ibyte == a byte in such text
Ichar == a char as represented in internal character format
thus e.g.
set_charptr_emchar -> set_itext_ichar
The pre and post tags on either side of this change are:
pre-internal-format-textual-renaming
post-internal-format-textual-renaming
See the Internals Manual for details of exactly how this was done,
how to handle the change in your workspace, etc.
author | ben |
---|---|
date | Wed, 05 Jun 2002 09:58:45 +0000 |
parents | e7ee5f8bde58 |
children | 79c6ff3eef26 |
line wrap: on
line diff
--- a/src/syswindows.h Tue Jun 04 17:40:00 2002 +0000 +++ b/src/syswindows.h Wed Jun 05 09:58:45 2002 +0000 @@ -798,7 +798,7 @@ Extbyte *convert_multibyte_to_unicode_malloc (const Extbyte *src, Bytecount n, int cp, Bytecount *size_out); -Intbyte *convert_multibyte_to_internal_malloc (const Extbyte *src, +Ibyte *convert_multibyte_to_internal_malloc (const Extbyte *src, Bytecount n, int cp, Bytecount *size_out); void convert_multibyte_to_unicode_dynarr (const Extbyte *src, Bytecount n, @@ -827,7 +827,7 @@ #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \ do { \ - Intbyte *lttff; \ + Ibyte *lttff; \ \ LOCAL_TO_WIN32_FILE_FORMAT (XSTRING_DATA (path), lttff); \ C_STRING_TO_TSTR (lttff, out); \ @@ -854,14 +854,14 @@ get 7-bit ISO2022-encoded data. We know that our internal format \ is ASCII-compatible, and so these functions will work fine with \ this data. */ \ - Intbyte *ltwffp = (path); \ + Ibyte *ltwffp = (path); \ if (isalpha (ltwffp[0]) && (IS_DEVICE_SEP (ltwffp[1]))) \ pathout = ltwffp; \ else \ { \ int ltwff2 = \ cygwin_posix_to_win32_path_list_buf_size ((char *) ltwffp); \ - pathout = (Intbyte *) ALLOCA (ltwff2); \ + pathout = (Ibyte *) ALLOCA (ltwff2); \ cygwin_posix_to_win32_path_list ((char *) ltwffp, (char *) pathout); \ } \ } while (0) @@ -875,10 +875,10 @@ #ifdef CYGWIN #define WIN32_TO_LOCAL_FILE_FORMAT(path, pathout) \ do { \ - Intbyte *wtlff1 = (path); \ + Ibyte *wtlff1 = (path); \ int wtlff2 = \ cygwin_win32_to_posix_path_list_buf_size ((char *) wtlff1); \ - Intbyte *wtlff3 = (Intbyte *) ALLOCA (wtlff2); \ + Ibyte *wtlff3 = (Ibyte *) ALLOCA (wtlff2); \ cygwin_win32_to_posix_path_list ((char *) wtlff1, (char *) wtlff3); \ (pathout) = wtlff3; \ } while (0) @@ -897,8 +897,8 @@ #define LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR(lispstr, pathout) \ do \ { \ - Intbyte *lffmutt_fname1; \ - Intbyte *lffmutt_pathint = XSTRING_DATA (lispstr); \ + Ibyte *lffmutt_fname1; \ + Ibyte *lffmutt_pathint = XSTRING_DATA (lispstr); \ \ if ((lffmutt_fname1 = qxestrchr (lffmutt_pathint, ':')) != NULL \ && *++lffmutt_fname1 == '/' && *++lffmutt_fname1 == '/') \ @@ -908,13 +908,13 @@ together. */ \ if (qxestrncasecmp_c (lffmutt_pathint, "file://", 7) == 0) \ { \ - Intbyte *lffmutt_path1, *lffmutt_path2; \ + Ibyte *lffmutt_path1, *lffmutt_path2; \ LOCAL_TO_WIN32_FILE_FORMAT (lffmutt_pathint + 7, lffmutt_path1); \ if (lffmutt_path1 == lffmutt_pathint + 7) /* Optimization */ \ lffmutt_path2 = lffmutt_pathint; \ else \ { \ - lffmutt_path2 = alloca_intbytes (7 + qxestrlen (lffmutt_path1) \ + lffmutt_path2 = alloca_ibytes (7 + qxestrlen (lffmutt_path1) \ + 1); \ qxestrncpy (lffmutt_path2, lffmutt_pathint, 7); \ qxestrcpy (lffmutt_path2 + 7, lffmutt_path1); \ @@ -939,10 +939,10 @@ #endif /* not CYGWIN */ -Intbyte *urlify_filename (Intbyte *filename); -Intbyte *mswindows_canonicalize_filename (Intbyte *name); +Ibyte *urlify_filename (Ibyte *filename); +Ibyte *mswindows_canonicalize_filename (Ibyte *name); #define MSWINDOWS_NORMALIZE_FILENAME(name) \ - INTBYTE_STRING_TO_ALLOCA (mswindows_canonicalize_filename (name), name) + IBYTE_STRING_TO_ALLOCA (mswindows_canonicalize_filename (name), name) /* ------------------- Functions needed dynamic binding ------------------- */ @@ -961,7 +961,7 @@ typedef struct file_data { - const Intbyte *name; + const Ibyte *name; unsigned long size; HANDLE file; HANDLE file_mapping; @@ -980,8 +980,8 @@ ((void *)(RVA_TO_OFFSET(var,section) + \ (char *)(filedata).file_base)) -int open_input_file (file_data *p_file, const Intbyte *name); -int open_output_file (file_data *p_file, const Intbyte *name, +int open_input_file (file_data *p_file, const Ibyte *name); +int open_output_file (file_data *p_file, const Ibyte *name, unsigned long size); void close_file_data (file_data *p_file); @@ -1037,21 +1037,21 @@ #ifdef WIN32_NATIVE DECLARE_INLINE_HEADER (int strcasecmp (const char *a, const char *b)) { - return qxestrcasecmp ((const Intbyte *) a, (const Intbyte *) b); + return qxestrcasecmp ((const Ibyte *) a, (const Ibyte *) b); } #endif /* WIN32_NATIVE */ /* in nt.c */ -int mswindows_access (const Intbyte *path, int mode); -int mswindows_link (const Intbyte *old, const Intbyte *new); -int mswindows_rename (const Intbyte *oldname, const Intbyte *newname); -int mswindows_unlink (const Intbyte *path); -int mswindows_stat (const Intbyte *path, struct stat *buf); +int mswindows_access (const Ibyte *path, int mode); +int mswindows_link (const Ibyte *old, const Ibyte *new); +int mswindows_rename (const Ibyte *oldname, const Ibyte *newname); +int mswindows_unlink (const Ibyte *path); +int mswindows_stat (const Ibyte *path, struct stat *buf); int mswindows_fstat (int desc, struct stat *buf); time_t mswindows_convert_time (FILETIME ft); -void mswindows_executable_type (const Intbyte * filename, int * is_dos_app, +void mswindows_executable_type (const Ibyte * filename, int * is_dos_app, int * is_cygnus_app); -Intbyte *mswindows_getdcwd (int drivelet); +Ibyte *mswindows_getdcwd (int drivelet); /* In process-nt.c */ extern int mswindows_compare_env (const void *strp1, const void *strp2);