sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

tdb2: fix prototypes which return enum TDB_ERROR.

Browse Source 
Since enums and ints are compatible in C, the compiler didn't warn
that our prototypes for these functions disagreed with the
definitions.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 6d3832ee613adeb9ae7ed6454996ffa39c32650f)
This commit is contained in:
Rusty Russell 2011-09-14 08:13:28 +09:30
parent c5c0a4d331
commit 2d7c85a971
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tdb2/check.c
View File

@ -436,7 +436,7 @@ fail:
static enum TDB_ERROR check_hash(struct tdb_context *tdb,
tdb_off_t used[],
size_t num_used, size_t num_ftables,
int (*check)(TDB_DATA, TDB_DATA, void *),
enum TDB_ERROR (*check)(TDB_DATA, TDB_DATA, void *),
void *data)
{
/* Free tables also show up as used. */

18
lib/tdb2/private.h
View File

@ -356,13 +356,13 @@ struct tdb_methods {
uint64_t tdb_jenkins_hash(const void *key, size_t length, uint64_t seed,
void *unused);
tdb_bool_err first_in_hash(struct tdb_context *tdb,
struct traverse_info *tinfo,
TDB_DATA *kbuf, size_t *dlen);
enum TDB_ERROR first_in_hash(struct tdb_context *tdb,
struct traverse_info *tinfo,
TDB_DATA *kbuf, size_t *dlen);
tdb_bool_err next_in_hash(struct tdb_context *tdb,
struct traverse_info *tinfo,
TDB_DATA *kbuf, size_t *dlen);
enum TDB_ERROR next_in_hash(struct tdb_context *tdb,
struct traverse_info *tinfo,
TDB_DATA *kbuf, size_t *dlen);
/* Hash random memory. */
uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len);
@ -658,9 +658,9 @@ int tdb1_check(struct tdb_context *tdb,
/* tdb1_open.c: */
int tdb1_new_database(struct tdb_context *tdb,
struct tdb_attribute_tdb1_hashsize *hashsize,
struct tdb_attribute_tdb1_max_dead *max_dead);
enum TDB_ERROR tdb1_new_database(struct tdb_context *tdb,
struct tdb_attribute_tdb1_hashsize *hashsize,
struct tdb_attribute_tdb1_max_dead *max_dead);
enum TDB_ERROR tdb1_open(struct tdb_context *tdb,
struct tdb_attribute_tdb1_max_dead *max_dead);