[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  1f50b6c tdb/test: fix build on OSF/1
      from  8defcb8 Revert "s3:smbd: include smbXsrv.h before smbd/proto.h to have the smbXsrv_ structs available"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1f50b6c3aefe9a7ac64641b1e9c23e014459647f
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Aug 10 21:50:22 2012 +0200

    tdb/test: fix build on OSF/1
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Fri Aug 10 23:33:20 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/tdb/test/lock-tracking.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/test/lock-tracking.c b/lib/tdb/test/lock-tracking.c
index b6f1cc2..90a07f8 100644
--- a/lib/tdb/test/lock-tracking.c
+++ b/lib/tdb/test/lock-tracking.c
@@ -7,13 +7,13 @@
 #include "tap-interface.h"
 #include "lock-tracking.h"
 
-struct lock {
-	struct lock *next;
+struct testlock {
+	struct testlock *next;
 	unsigned int off;
 	unsigned int len;
 	int type;
 };
-static struct lock *locks;
+static struct testlock *testlocks;
 int locking_errors = 0;
 bool suppress_lockcheck = false;
 bool nonblocking_locks;
@@ -52,10 +52,10 @@ int fcntl_with_lockcheck(int fd, int cmd, ... /* arg */ )
 	}
 
 	if (fl->l_type == F_UNLCK) {
-		struct lock **l;
-		struct lock *old = NULL;
+		struct testlock **l;
+		struct testlock *old = NULL;
 
-		for (l = &locks; *l; l = &(*l)->next) {
+		for (l = &testlocks; *l; l = &(*l)->next) {
 			if ((*l)->off == fl->l_start
 			    && (*l)->len == fl->l_len) {
 				if (ret == 0) {
@@ -72,13 +72,13 @@ int fcntl_with_lockcheck(int fd, int cmd, ... /* arg */ )
 			locking_errors++;
 		}
 	} else {
-		struct lock *new, *i;
+		struct testlock *new, *i;
 		unsigned int fl_end = fl->l_start + fl->l_len;
 		if (fl->l_len == 0)
 			fl_end = (unsigned int)-1;
 
 		/* Check for overlaps: we shouldn't do this. */
-		for (i = locks; i; i = i->next) {
+		for (i = testlocks; i; i = i->next) {
 			unsigned int i_end = i->off + i->len;
 			if (i->len == 0)
 				i_end = (unsigned int)-1;
@@ -110,7 +110,7 @@ int fcntl_with_lockcheck(int fd, int cmd, ... /* arg */ )
 				goto done;
 			}
 			if (!suppress_lockcheck) {
-				diag("%s lock %u@%u overlaps %u@%u",
+				diag("%s testlock %u@%u overlaps %u@%u",
 				     fl->l_type == F_WRLCK ? "write" : "read",
 				     (int)fl->l_len, (int)fl->l_start,
 				     i->len, (int)i->off);
@@ -123,8 +123,8 @@ int fcntl_with_lockcheck(int fd, int cmd, ... /* arg */ )
 			new->off = fl->l_start;
 			new->len = fl->l_len;
 			new->type = fl->l_type;
-			new->next = locks;
-			locks = new;
+			new->next = testlocks;
+			testlocks = new;
 		}
 	}
 done:
@@ -136,10 +136,10 @@ done:
 unsigned int forget_locking(void)
 {
 	unsigned int num = 0;
-	while (locks) {
-		struct lock *next = locks->next;
-		free(locks);
-		locks = next;
+	while (testlocks) {
+		struct testlock *next = testlocks->next;
+		free(testlocks);
+		testlocks = next;
 		num++;
 	}
 	return num;


-- 
Samba Shared Repository