svn commit: samba r22317 - in
branches/SAMBA_3_0/source/lib/tdb/common: .
metze at samba.org
metze at samba.org
Tue Apr 17 17:07:14 GMT 2007
Author: metze
Date: 2007-04-17 17:07:14 +0000 (Tue, 17 Apr 2007)
New Revision: 22317
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22317
Log:
add tdb_ prefix to non static function
metze
Modified:
branches/SAMBA_3_0/source/lib/tdb/common/freelist.c
branches/SAMBA_3_0/source/lib/tdb/common/freelistcheck.c
branches/SAMBA_3_0/source/lib/tdb/common/tdb_private.h
Changeset:
Modified: branches/SAMBA_3_0/source/lib/tdb/common/freelist.c
===================================================================
--- branches/SAMBA_3_0/source/lib/tdb/common/freelist.c 2007-04-17 17:03:38 UTC (rev 22316)
+++ branches/SAMBA_3_0/source/lib/tdb/common/freelist.c 2007-04-17 17:07:14 UTC (rev 22317)
@@ -29,7 +29,7 @@
#include "tdb_private.h"
/* read a freelist record and check for simple errors */
-int rec_free_read(struct tdb_context *tdb, tdb_off_t off, struct list_struct *rec)
+int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off, struct list_struct *rec)
{
if (tdb->methods->tdb_read(tdb, off, rec, sizeof(*rec),DOCONV()) == -1)
return -1;
@@ -37,7 +37,7 @@
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, TDB_DEBUG_WARNING, "rec_free_read non-free magic 0x%x at offset=%d - fixing\n",
+ TDB_LOG((tdb, TDB_DEBUG_WARNING, "tdb_rec_free_read non-free magic 0x%x at offset=%d - fixing\n",
rec->magic, off));
rec->magic = TDB_FREE_MAGIC;
if (tdb->methods->tdb_write(tdb, off, rec, sizeof(*rec)) == -1)
@@ -47,7 +47,7 @@
if (rec->magic != TDB_FREE_MAGIC) {
/* Ensure ecode is set for log fn. */
tdb->ecode = TDB_ERR_CORRUPT;
- TDB_LOG((tdb, TDB_DEBUG_WARNING, "rec_free_read bad magic 0x%x at offset=%d\n",
+ TDB_LOG((tdb, TDB_DEBUG_WARNING, "tdb_rec_free_read bad magic 0x%x at offset=%d\n",
rec->magic, off));
return TDB_ERRCODE(TDB_ERR_CORRUPT, -1);
}
@@ -286,7 +286,7 @@
issues when faced with a slowly increasing record size.
*/
while (rec_ptr) {
- if (rec_free_read(tdb, rec_ptr, rec) == -1) {
+ if (tdb_rec_free_read(tdb, rec_ptr, rec) == -1) {
goto fail;
}
@@ -311,7 +311,7 @@
}
if (bestfit.rec_ptr != 0) {
- if (rec_free_read(tdb, bestfit.rec_ptr, rec) == -1) {
+ if (tdb_rec_free_read(tdb, bestfit.rec_ptr, rec) == -1) {
goto fail;
}
Modified: branches/SAMBA_3_0/source/lib/tdb/common/freelistcheck.c
===================================================================
--- branches/SAMBA_3_0/source/lib/tdb/common/freelistcheck.c 2007-04-17 17:03:38 UTC (rev 22316)
+++ branches/SAMBA_3_0/source/lib/tdb/common/freelistcheck.c 2007-04-17 17:07:14 UTC (rev 22317)
@@ -88,7 +88,7 @@
goto fail;
}
- if (rec_free_read(tdb, rec_ptr, &rec) == -1) {
+ if (tdb_rec_free_read(tdb, rec_ptr, &rec) == -1) {
goto fail;
}
Modified: branches/SAMBA_3_0/source/lib/tdb/common/tdb_private.h
===================================================================
--- branches/SAMBA_3_0/source/lib/tdb/common/tdb_private.h 2007-04-17 17:03:38 UTC (rev 22316)
+++ branches/SAMBA_3_0/source/lib/tdb/common/tdb_private.h 2007-04-17 17:07:14 UTC (rev 22317)
@@ -206,7 +206,7 @@
struct list_struct *rec);
void tdb_io_init(struct tdb_context *tdb);
int tdb_expand(struct tdb_context *tdb, tdb_off_t size);
-int rec_free_read(struct tdb_context *tdb, tdb_off_t off,
- struct list_struct *rec);
+int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off,
+ struct list_struct *rec);
More information about the samba-cvs
mailing list