diff src/filelock.c @ 80:1ce6082ce73f r20-0b90

Import from CVS: tag r20-0b90
author cvs
date Mon, 13 Aug 2007 09:06:37 +0200
parents 131b0175ea99
children 4be1180a9e89
line wrap: on
line diff
--- a/src/filelock.c	Mon Aug 13 09:05:44 2007 +0200
+++ b/src/filelock.c	Mon Aug 13 09:06:37 2007 +0200
@@ -69,9 +69,8 @@
 
 #ifndef HAVE_LONG_FILE_NAMES
 
-#define MAKE_LOCK_NAME(lock, file)					    \
-  (lock = (char *) alloca (14 + XSTRING_LENGTH (Vlock_directory) + \
-			   1),						    \
+#define MAKE_LOCK_NAME(lock, file)					\
+  (lock = (char *) alloca (14 + XSTRING_LENGTH (Vlock_directory) + 1),	\
    fill_in_lock_short_file_name (lock, (file)))
 
 static void
@@ -107,7 +106,7 @@
     int need_slash = 0;
 
     /* in case lock-directory doesn't end in / */
-    if (string_byte (XSTRING (Vlock_directory),
+    if (XSTRING_BYTE (Vlock_directory,
 		     XSTRING_LENGTH (Vlock_directory) - 1) != '/')
       need_slash = 1;
 
@@ -122,9 +121,9 @@
 #else /* defined HAVE_LONG_FILE_NAMES */
 
 /* +2 for terminating null and possible extra slash */
-#define MAKE_LOCK_NAME(lock, file)				\
-  (lock = (char *) alloca (XSTRING_LENGTH (file) +		\
-			   XSTRING_LENGTH (Vlock_directory) + 2),\
+#define MAKE_LOCK_NAME(lock, file)					\
+  (lock = (char *) alloca (XSTRING_LENGTH (file) +			\
+			   XSTRING_LENGTH (Vlock_directory) + 2),	\
    fill_in_lock_file_name (lock, (file)))
 
 static void