Mercurial > hg > xemacs-beta

diff src/filelock.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 84762348c6f9
children a8d8f419b459
line wrap: on
line diff
--- a/src/filelock.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/filelock.c	Wed Jun 05 09:58:45 2002 +0000
@@ -78,8 +78,8 @@
 
 typedef struct
 {
-  Intbyte *user;
-  Intbyte *host;
+  Ibyte *user;
+  Ibyte *host;
   pid_t pid;
 } lock_info_type;
 
@@ -93,14 +93,14 @@
 /* Write the name of the lock file for FN into LFNAME.  Length will be
    that of FN plus two more for the leading `.#' plus one for the null.  */
 #define MAKE_LOCK_NAME(lock, file) \
-  (lock = (Intbyte *) ALLOCA (XSTRING_LENGTH (file) + 2 + 1), \
+  (lock = (Ibyte *) ALLOCA (XSTRING_LENGTH (file) + 2 + 1), \
    fill_in_lock_file_name (lock, file))
 
 static void
-fill_in_lock_file_name (Intbyte *lockfile, Lisp_Object fn)
+fill_in_lock_file_name (Ibyte *lockfile, Lisp_Object fn)
 {
-  Intbyte *file_name = XSTRING_DATA (fn);
-  Intbyte *p;
+  Ibyte *file_name = XSTRING_DATA (fn);
+  Ibyte *p;
   Bytecount dirlen;
 
   for (p = file_name + XSTRING_LENGTH (fn) - 1;
@@ -121,24 +121,24 @@
    Return 1 if successful, 0 if not.  */
 
 static int
-lock_file_1 (Intbyte *lfname, int force)
+lock_file_1 (Ibyte *lfname, int force)
 {
   /* Does not GC. */
   int err;
-  Intbyte *lock_info_str;
-  Intbyte *host_name;
-  Intbyte *user_name = user_login_name (NULL);
+  Ibyte *lock_info_str;
+  Ibyte *host_name;
+  Ibyte *user_name = user_login_name (NULL);
 
   if (user_name == NULL)
-    user_name = (Intbyte *) "";
+    user_name = (Ibyte *) "";
 
   if (STRINGP (Vsystem_name))
     host_name = XSTRING_DATA (Vsystem_name);
   else
-    host_name = (Intbyte *) "";
+    host_name = (Ibyte *) "";
 
   lock_info_str =
-    (Intbyte *) ALLOCA (qxestrlen (user_name) + qxestrlen (host_name)
+    (Ibyte *) ALLOCA (qxestrlen (user_name) + qxestrlen (host_name)
 			+ LOCK_PID_MAX + 5);
 
   qxesprintf (lock_info_str, "%s@%s.%d", user_name, host_name, qxe_getpid ());
@@ -159,20 +159,20 @@
    or -1 if something is wrong with the locking mechanism.  */
 
 static int
-current_lock_owner (lock_info_type *owner, Intbyte *lfname)
+current_lock_owner (lock_info_type *owner, Ibyte *lfname)
 {
   /* Does not GC. */
   int len, ret;
   int local_owner = 0;
-  Intbyte *at, *dot;
-  Intbyte *lfinfo = 0;
+  Ibyte *at, *dot;
+  Ibyte *lfinfo = 0;
   int bufsize = 50;
   /* Read arbitrarily-long contents of symlink.  Similar code in
      file-symlink-p in fileio.c.  */
   do
     {
       bufsize *= 2;
-      lfinfo = (Intbyte *) xrealloc (lfinfo, bufsize);
+      lfinfo = (Ibyte *) xrealloc (lfinfo, bufsize);
       len = qxe_readlink (lfname, lfinfo, bufsize);
     }
   while (len >= bufsize);
@@ -204,16 +204,16 @@
     return -1;
   }
   len = at - lfinfo;
-  owner->user = (Intbyte *) xmalloc (len + 1);
+  owner->user = (Ibyte *) xmalloc (len + 1);
   qxestrncpy (owner->user, lfinfo, len);
   owner->user[len] = 0;
 
   /* The PID is everything after the last `.'.  */
-  owner->pid = atoi ((CIntbyte *) dot + 1);
+  owner->pid = atoi ((CIbyte *) dot + 1);
 
   /* The host is everything in between.  */
   len = dot - at - 1;
-  owner->host = (Intbyte *) xmalloc (len + 1);
+  owner->host = (Ibyte *) xmalloc (len + 1);
   qxestrncpy (owner->host, at + 1, len);
   owner->host[len] = 0;
 
@@ -257,10 +257,10 @@
    Return -1 if cannot lock for any other reason.  */
 
 static int
-lock_if_free (lock_info_type *clasher, Intbyte *lfname)
+lock_if_free (lock_info_type *clasher, Ibyte *lfname)
 {
   /* Does not GC. */
-  if (lock_file_1 ((Intbyte *) lfname, 0) == 0)
+  if (lock_file_1 ((Ibyte *) lfname, 0) == 0)
     {
       int locker;
 
@@ -309,7 +309,7 @@
      comment.  -slb */
 
   register Lisp_Object attack, orig_fn;
-  register Intbyte *lfname, *locker;
+  register Ibyte *lfname, *locker;
   lock_info_type lock_info;
   struct gcpro gcpro1, gcpro2, gcpro3;
   Lisp_Object old_current_buffer;
@@ -346,7 +346,7 @@
     goto done;
 
   /* Else consider breaking the lock */
-  locker = (Intbyte *) ALLOCA (qxestrlen (lock_info.user)
+  locker = (Ibyte *) ALLOCA (qxestrlen (lock_info.user)
 			       + qxestrlen (lock_info.host)
 			       + LOCK_PID_MAX + 9);
   qxesprintf (locker, "%s@%s (pid %d)", lock_info.user, lock_info.host,
@@ -371,7 +371,7 @@
 unlock_file (Lisp_Object fn)
 {
   /* This can GC */
-  register Intbyte *lfname;
+  register Ibyte *lfname;
   struct gcpro gcpro1;
 
   GCPRO1 (fn);
@@ -454,7 +454,7 @@
        (filename))
 {
   Lisp_Object ret;
-  register Intbyte *lfname;
+  register Ibyte *lfname;
   int owner;
   lock_info_type locker;
   struct gcpro gcpro1;