diff src/dired-msw.c @ 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 6728e641994e
children 79c6ff3eef26
line wrap: on
line diff
--- a/src/dired-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/dired-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -118,7 +118,7 @@
   FILETIME ftLastWriteTime;
   DWORD nFileSizeHigh;
   DWORD nFileSizeLow;
-  Intbyte *cFileName;
+  Ibyte *cFileName;
 } Win32_file;
   
 typedef struct
@@ -284,7 +284,7 @@
 		       hide_dot)))
 		{
 		  file.cFileName =
-		    (Intbyte *) xmalloc (sizeof (Intbyte) * (1 + len));
+		    (Ibyte *) xmalloc (sizeof (Ibyte) * (1 + len));
 		  memcpy (file.cFileName, eidata (filename), len);
 		  file.cFileName[len] = '\0';
 		  Dynarr_add (files, file);
@@ -306,7 +306,7 @@
   Lisp_Object luser;
   double file_size;
   DECLARE_EISTRING (puta);
-  CIntbyte buf[666];
+  CIbyte buf[666];
 
   file_size =
     file->nFileSizeHigh * (double)UINT_MAX + file->nFileSizeLow;
@@ -334,11 +334,11 @@
       is_executable = 1;
     else if (qxestrcharlen (file->cFileName) > 4)
       {
-	Intbyte *end = file->cFileName + qxestrlen (file->cFileName);
-	DEC_CHARPTR (end);
-	DEC_CHARPTR (end);
-	DEC_CHARPTR (end);
-	DEC_CHARPTR (end);
+	Ibyte *end = file->cFileName + qxestrlen (file->cFileName);
+	DEC_IBYTEPTR (end);
+	DEC_IBYTEPTR (end);
+	DEC_IBYTEPTR (end);
+	DEC_IBYTEPTR (end);
 	if (qxestrcasecmp (end, ".exe") == 0
 	    || qxestrcasecmp (end, ".com") == 0
 	    || qxestrcasecmp (end, ".bat") == 0
@@ -364,14 +364,14 @@
     sprintf (buf, "%-9d", 0);
   else
     {
-      Intbyte *str;
+      Ibyte *str;
 
       str = XSTRING_DATA (luser);
       sprintf (buf, "%-8s ", str);
     }
-  eicat_raw (puta, (Intbyte *) buf, strlen (buf));
+  eicat_raw (puta, (Ibyte *) buf, strlen (buf));
   {
-    CIntbyte *cptr = buf;
+    CIbyte *cptr = buf;
     sprintf (buf, "%-8d ", getgid ());
     cptr += 9;
     if (file_size > 99999999.0)
@@ -388,7 +388,7 @@
       ++cptr;
     {
       time_t t, now;
-      Intbyte *ctimebuf;
+      Ibyte *ctimebuf;
 
       if (
 #if 0
@@ -470,14 +470,14 @@
 
   if (!NILP (switches))
     {
-      Intbyte *cptr, *cptr_end;
+      Ibyte *cptr, *cptr_end;
 
       CHECK_STRING (switches);
       cptr = XSTRING_DATA (switches);
       cptr_end = cptr + XSTRING_LENGTH (switches);
       while (cptr < cptr_end)
 	{
-	  Emchar ch = charptr_emchar (cptr);
+	  Ichar ch = itext_ichar (cptr);
 	  switch (ch)
 	    {
 	    case 'A':
@@ -500,7 +500,7 @@
 	      sort_by = MSWINDOWS_SORT_BY_MOD_DATE;
 	      break;
 	    }
-	  INC_CHARPTR (cptr);
+	  INC_IBYTEPTR (cptr);
 	}
     }