1 Sep 2004 01:57
svn commit: samba r2154 - in branches/SAMBA_4_0/source/lib/tdb/common: .
<tpot <at> samba.org>
2004-08-31 23:57:14 GMT
2004-08-31 23:57:14 GMT
Author: tpot Date: 2004-08-31 23:57:14 +0000 (Tue, 31 Aug 2004) New Revision: 2154 WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/lib/tdb/common&rev=2154&nolog=1 Log: Merge of Jim's format string fixup in r2130:2131 Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb.c Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb.c =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/common/tdb.c 2004-08-31 22:52:11 UTC (rev 2153) +++ branches/SAMBA_4_0/source/lib/tdb/common/tdb.c 2004-08-31 23:57:14 UTC (rev 2154) <at> <at> -490,7 +490,7 <at> <at> if (rec->magic == TDB_MAGIC) { /* this happens when a app is showdown while deleting a record - we should not completely fail when this happens */ - TDB_LOG((tdb, 0,"rec_free_read non-free magic at offset=%d - fixing\n", + TDB_LOG((tdb, 0,"rec_free_read non-free magic 0x%x at offset=%d - fixing\n", rec->magic, off)); rec->magic = TDB_FREE_MAGIC; if (tdb_write(tdb, off, rec, sizeof(*rec)) == -1)
.
tridge:
the lp_use_mmap() in map_file() is inappropriate for 2 reasons, so I have removed it.
- lp_use_mmap() is really meant to cope with systems that have broken
mmap coherence, but map_file() doesn't need coherence, as its maps
read only
- map_file() is used to map the charset files before loadparm has
loaded, so lp_use_mmap() is always returning false for the major
use of map_file()
Jeremy.
Modified:
branches/SAMBA_3_0/source/lib/util_file.c
Changeset:
Sorry, the patch is too large (802 lines) to include; please use WebSVN to see it!
WebSVN:
RSS Feed