X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Flock_file.c;h=957bc4e89bbba93f0d5c59a8e6fd8bcde20521ee;hp=b62604a619c5d47c268a6844dcffa78571a3800f;hb=d4bcca1aa235370bc20bc2734c0cd6f700b17871;hpb=c6cf5c38fb74a2399cc656357be571f1669a36d1

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index b62604a..957bc4e 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -44,8 +44,10 @@
 #include <lockfile.h>
 #endif
 
-#ifdef LOCKDIR
+#ifdef DOT_LOCKING
+# ifdef LOCKDIR
 char *lockdir = LOCKDIR;
+# endif
 #endif
 
 /* Are we using any kernel locking? */
@@ -514,11 +516,11 @@ timerON(char *curlock, int fd)
 	struct lock *lp;
 	size_t len;
 
-	lp = (struct lock *) mh_xmalloc(sizeof(*lp));
+	lp = mh_xcalloc(1, sizeof(*lp));
 
 	len = strlen(curlock) + 1;
 	lp->l_fd = fd;
-	lp->l_lock = mh_xmalloc(len);
+	lp->l_lock = mh_xcalloc(len, sizeof(char));
 	memcpy(lp->l_lock, curlock, len);
 	lp->l_next = l_top;
 
@@ -555,8 +557,8 @@ timerOFF(int fd)
 			else
 				pp->l_next = lp->l_next;
 
-			free(lp->l_lock);
-			free(lp);
+			mh_free0(&(lp->l_lock));
+			mh_free0(&lp);
 		}
 	}