summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-11-21 19:45:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:00 -0500
commitbb4fb75b2216f9f58e8f8fad43bc39634148b315 (patch)
tree94ac2bff19c0998040fb448329e1685c702420ec /source3
parentef4112922ab5d7b40b390356b55816659b9bd446 (diff)
downloadsamba-bb4fb75b2216f9f58e8f8fad43bc39634148b315.tar.gz
samba-bb4fb75b2216f9f58e8f8fad43bc39634148b315.tar.bz2
samba-bb4fb75b2216f9f58e8f8fad43bc39634148b315.zip
r19823: "log" is an internal define in older versions of gcc.
Rename to log_ctx. Jeremy. (This used to be commit dbf0e58a1e7fa77ce0338104cf71c7a81214884b)
Diffstat (limited to 'source3')
-rw-r--r--source3/tdb/common/dump.c2
-rw-r--r--source3/tdb/common/open.c4
-rw-r--r--source3/tdb/include/tdb.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/tdb/common/dump.c b/source3/tdb/common/dump.c
index 70382ca949..3f5c2c87f5 100644
--- a/source3/tdb/common/dump.c
+++ b/source3/tdb/common/dump.c
@@ -40,7 +40,7 @@ static tdb_off_t tdb_dump_record(struct tdb_context *tdb, int hash,
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);
diff --git a/source3/tdb/common/open.c b/source3/tdb/common/open.c
index e1f21aa856..224103e679 100644
--- a/source3/tdb/common/open.c
+++ b/source3/tdb/common/open.c
@@ -372,9 +372,9 @@ int tdb_close(struct tdb_context *tdb)
/* 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)
diff --git a/source3/tdb/include/tdb.h b/source3/tdb/include/tdb.h
index 691c26af81..920ac5c6d9 100644
--- a/source3/tdb/include/tdb.h
+++ b/source3/tdb/include/tdb.h
@@ -97,7 +97,7 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
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);