Browse Source

tdb2: fix prototypes which return enum TDB_ERROR.

Since enums and ints are compatible in C, the compiler didn't warn
that our prototypes for these functions disagreed with the
definitions.
Rusty Russell 14 years ago
parent
commit
6d3832ee61
2 changed files with 10 additions and 10 deletions
  1. 1 1
      ccan/tdb2/check.c
  2. 9 9
      ccan/tdb2/private.h

+ 1 - 1
ccan/tdb2/check.c

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

+ 9 - 9
ccan/tdb2/private.h

@@ -342,13 +342,13 @@ struct tdb_methods {
 uint64_t tdb_jenkins_hash(const void *key, size_t length, uint64_t seed,
 uint64_t tdb_jenkins_hash(const void *key, size_t length, uint64_t seed,
 			  void *unused);
 			  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. */
 /* Hash random memory. */
 uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len);
 uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len);
@@ -644,9 +644,9 @@ int tdb1_check(struct tdb_context *tdb,
 
 
 
 
 /* tdb1_open.c: */
 /* 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,
 enum TDB_ERROR tdb1_open(struct tdb_context *tdb,
 			 struct tdb_attribute_tdb1_max_dead *max_dead);
 			 struct tdb_attribute_tdb1_max_dead *max_dead);