Skip to content

Commit

Permalink
MB-100 Fix build under -Wpedantic -Werror
Browse files Browse the repository at this point in the history
Change-Id: I7f79fc86a3e54a84d38ce5537302491361a91b45
Reviewed-on: http://review.couchbase.org/19221
Reviewed-by: Jens Alfke <jens@couchbase.com>
Tested-by: Aaron Miller <apage43@ninjawhale.com>
  • Loading branch information
apage43 committed Aug 2, 2012
1 parent c924573 commit 6a0fd89
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/couch_db.c
Expand Up @@ -633,7 +633,7 @@ couchstore_error_t couchstore_changes_since(Db *db,
char since_termbuf[6];
sized_buf since_term;
sized_buf *keylist = &since_term;
lookup_context cbctx = {db, options, callback, ctx, 0};
lookup_context cbctx = {db, options, callback, ctx, 0, 0, NULL};
couchfile_lookup_request rq;
sized_buf cmptmp;
couchstore_error_t errcode;
Expand Down Expand Up @@ -670,7 +670,7 @@ couchstore_error_t couchstore_all_docs(Db *db,
{
sized_buf startKey = {NULL, 0};
sized_buf *keylist = &startKey;
lookup_context cbctx = {db, options, callback, ctx, 1};
lookup_context cbctx = {db, options, callback, ctx, 1, 0, NULL};
couchfile_lookup_request rq;
sized_buf cmptmp;
couchstore_error_t errcode;
Expand Down Expand Up @@ -784,7 +784,7 @@ couchstore_error_t couchstore_walk_seq_tree(Db *db,
couchstore_walk_tree_callback_fn callback,
void *ctx)
{
char start_termbuf[6] = {};
char start_termbuf[6] = {0,0,0,0,0,0};
sized_buf start_term = {start_termbuf, 6};
set_bits(start_term.buf, 0, 48, startSequence);

Expand Down Expand Up @@ -837,7 +837,7 @@ static couchstore_error_t iterate_docinfos(Db *db,
}

// Construct the lookup request:
lookup_context cbctx = {db, 0, callback, ctx, (tree == db->header.by_id_root)};
lookup_context cbctx = {db, 0, callback, ctx, (tree == db->header.by_id_root), 0, NULL};
couchfile_lookup_request rq;
sized_buf cmptmp;
rq.cmp.compare = key_compare;
Expand Down
1 change: 1 addition & 0 deletions src/dbdump.c
Expand Up @@ -118,6 +118,7 @@ static int visit_node(Db *db,
const sized_buf* reduceValue,
void *ctx)
{
(void) db;
for (int i = 0; i < depth; ++i)
printf(" ");
if (reduceValue) {
Expand Down

0 comments on commit 6a0fd89

Please sign in to comment.