svn commit: samba r19823 - in branches: SAMBA_3_0/source/tdb/common SAMBA_3_0/source/tdb/include SAMBA_3_0_24/source/tdb/common SAMBA_3_0_24/source/tdb/include

[jra at samba.org]

Author: jra
Date: 2006-11-21 19:45:53 +0000 (Tue, 21 Nov 2006)
New Revision: 19823

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

Log:
"log" is an internal define in older versions of gcc.
Rename to log_ctx.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/tdb/common/dump.c
   branches/SAMBA_3_0/source/tdb/common/open.c
   branches/SAMBA_3_0/source/tdb/include/tdb.h
   branches/SAMBA_3_0_24/source/tdb/common/dump.c
   branches/SAMBA_3_0_24/source/tdb/common/open.c
   branches/SAMBA_3_0_24/source/tdb/include/tdb.h


Changeset:
Modified: branches/SAMBA_3_0/source/tdb/common/dump.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/common/dump.c	2006-11-21 15:33:55 UTC (rev 19822)
+++ branches/SAMBA_3_0/source/tdb/common/dump.c	2006-11-21 19:45:53 UTC (rev 19823)
@@ -40,7 +40,7 @@
 		return 0;
 	}
 
-	printf(" rec: hash=%d, offset=0x%08x next=0x%08x rec_len=%d "
+	printf(" rec: hash=%d offset=0x%08x next=0x%08x rec_len=%d "
 	       "key_len=%d data_len=%d full_hash=0x%x magic=0x%x\n",
 	       hash, offset, rec.next, rec.rec_len, rec.key_len, rec.data_len,
 	       rec.full_hash, rec.magic);

Modified: branches/SAMBA_3_0/source/tdb/common/open.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/common/open.c	2006-11-21 15:33:55 UTC (rev 19822)
+++ branches/SAMBA_3_0/source/tdb/common/open.c	2006-11-21 19:45:53 UTC (rev 19823)
@@ -372,9 +372,9 @@
 
 /* register a loging function */
 void tdb_set_logging_function(struct tdb_context *tdb,
-                              const struct tdb_logging_context *log)
+                              const struct tdb_logging_context *log_ctx)
 {
-        tdb->log = *log;
+        tdb->log = *log_ctx;
 }
 
 void *tdb_get_logging_private(struct tdb_context *tdb)

Modified: branches/SAMBA_3_0/source/tdb/include/tdb.h
===================================================================
--- branches/SAMBA_3_0/source/tdb/include/tdb.h	2006-11-21 15:33:55 UTC (rev 19822)
+++ branches/SAMBA_3_0/source/tdb/include/tdb.h	2006-11-21 19:45:53 UTC (rev 19823)
@@ -97,7 +97,7 @@
 
 int tdb_reopen(struct tdb_context *tdb);
 int tdb_reopen_all(int parent_longlived);
-void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log);
+void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log_ctx);
 enum TDB_ERROR tdb_error(struct tdb_context *tdb);
 const char *tdb_errorstr(struct tdb_context *tdb);
 TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key);

Modified: branches/SAMBA_3_0_24/source/tdb/common/dump.c
===================================================================
--- branches/SAMBA_3_0_24/source/tdb/common/dump.c	2006-11-21 15:33:55 UTC (rev 19822)
+++ branches/SAMBA_3_0_24/source/tdb/common/dump.c	2006-11-21 19:45:53 UTC (rev 19823)
@@ -40,7 +40,7 @@
 		return 0;
 	}
 
-	printf(" rec: hash=%d, offset=0x%08x next=0x%08x rec_len=%d "
+	printf(" rec: hash=%d offset=0x%08x next=0x%08x rec_len=%d "
 	       "key_len=%d data_len=%d full_hash=0x%x magic=0x%x\n",
 	       hash, offset, rec.next, rec.rec_len, rec.key_len, rec.data_len,
 	       rec.full_hash, rec.magic);

Modified: branches/SAMBA_3_0_24/source/tdb/common/open.c
===================================================================
--- branches/SAMBA_3_0_24/source/tdb/common/open.c	2006-11-21 15:33:55 UTC (rev 19822)
+++ branches/SAMBA_3_0_24/source/tdb/common/open.c	2006-11-21 19:45:53 UTC (rev 19823)
@@ -372,9 +372,9 @@
 
 /* register a loging function */
 void tdb_set_logging_function(struct tdb_context *tdb,
-                              const struct tdb_logging_context *log)
+                              const struct tdb_logging_context *log_ctx)
 {
-        tdb->log = *log;
+        tdb->log = *log_ctx;
 }
 
 void *tdb_get_logging_private(struct tdb_context *tdb)

Modified: branches/SAMBA_3_0_24/source/tdb/include/tdb.h
===================================================================
--- branches/SAMBA_3_0_24/source/tdb/include/tdb.h	2006-11-21 15:33:55 UTC (rev 19822)
+++ branches/SAMBA_3_0_24/source/tdb/include/tdb.h	2006-11-21 19:45:53 UTC (rev 19823)
@@ -97,7 +97,7 @@
 
 int tdb_reopen(struct tdb_context *tdb);
 int tdb_reopen_all(int parent_longlived);
-void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log);
+void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log_ctx);
 enum TDB_ERROR tdb_error(struct tdb_context *tdb);
 const char *tdb_errorstr(struct tdb_context *tdb);
 TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key);