mirror of
https://github.com/samba-team/samba.git
synced 2025-02-04 17:47:26 +03:00
r22317: add tdb_ prefix to non static function
metze (This used to be commit 56e31d60c672689e934fbed2794c7c54cf874b11)
This commit is contained in:
parent
6f9f5bd745
commit
123e721590
@ -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 @@ int rec_free_read(struct tdb_context *tdb, tdb_off_t off, struct list_struct *re
|
||||
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 @@ int rec_free_read(struct tdb_context *tdb, tdb_off_t off, struct list_struct *re
|
||||
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 @@ tdb_off_t tdb_allocate(struct tdb_context *tdb, tdb_len_t length, struct list_st
|
||||
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 @@ tdb_off_t tdb_allocate(struct tdb_context *tdb, tdb_len_t length, struct list_st
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,7 @@ int tdb_validate_freelist(struct tdb_context *tdb, int *pnum_entries)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (rec_free_read(tdb, rec_ptr, &rec) == -1) {
|
||||
if (tdb_rec_free_read(tdb, rec_ptr, &rec) == -1) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
@ -206,7 +206,7 @@ tdb_off_t tdb_find_lock_hash(struct tdb_context *tdb, TDB_DATA key, u32 hash, in
|
||||
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);
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user