svn commit: samba r7974 - in trunk/source/locking: .

jra at samba.org jra at samba.org
Tue Jun 28 01:37:19 GMT 2005


Author: jra
Date: 2005-06-28 01:37:18 +0000 (Tue, 28 Jun 2005)
New Revision: 7974

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7974

Log:
One more tidyup to ensure we're using "struct posix_lock".
Jeremy.

Modified:
   trunk/source/locking/posix.c


Changeset:
Modified: trunk/source/locking/posix.c
===================================================================
--- trunk/source/locking/posix.c	2005-06-28 01:06:02 UTC (rev 7973)
+++ trunk/source/locking/posix.c	2005-06-28 01:37:18 UTC (rev 7974)
@@ -102,6 +102,7 @@
 	char *tp;
 
 	dbuf.dptr = NULL;
+	dbuf.dsize = 0;
 
 	dbuf = tdb_fetch(posix_pending_close_tdb, kbuf);
 
@@ -330,7 +331,7 @@
 		tdb_delete(posix_lock_tdb, kbuf);
 	} else {
 		if (entry < count-1) {
-			memmove(&locks[entry], &locks[entry+1], sizeof(*locks)*((count-1) - entry));
+			memmove(&locks[entry], &locks[entry+1], sizeof(struct posix_lock)*((count-1) - entry));
 		}
 		dbuf.dsize -= sizeof(struct posix_lock);
 		tdb_store(posix_lock_tdb, kbuf, dbuf, TDB_REPLACE);



More information about the samba-cvs mailing list