Skip to content

Commit 4553189

Browse files
ramsay-jonesgitster
authored andcommitted
reftable: fix some sparse warnings
Signed-off-by: Ramsay Jones <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 603ad4e commit 4553189

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

reftable/blocksource.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static uint64_t strbuf_size(void *b)
3939
return ((struct strbuf *)b)->len;
4040
}
4141

42-
struct reftable_block_source_vtable strbuf_vtable = {
42+
static struct reftable_block_source_vtable strbuf_vtable = {
4343
.size = &strbuf_size,
4444
.read_block = &strbuf_read_block,
4545
.return_block = &strbuf_return_block,
@@ -60,11 +60,11 @@ static void malloc_return_block(void *b, struct reftable_block *dest)
6060
reftable_free(dest->data);
6161
}
6262

63-
struct reftable_block_source_vtable malloc_vtable = {
63+
static struct reftable_block_source_vtable malloc_vtable = {
6464
.return_block = &malloc_return_block,
6565
};
6666

67-
struct reftable_block_source malloc_block_source_instance = {
67+
static struct reftable_block_source malloc_block_source_instance = {
6868
.ops = &malloc_vtable,
6969
};
7070

@@ -112,7 +112,7 @@ static int file_read_block(void *v, struct reftable_block *dest, uint64_t off,
112112
return size;
113113
}
114114

115-
struct reftable_block_source_vtable file_vtable = {
115+
static struct reftable_block_source_vtable file_vtable = {
116116
.size = &file_size,
117117
.read_block = &file_read_block,
118118
.return_block = &file_return_block,

reftable/iter.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static void empty_iterator_close(void *arg)
2929
{
3030
}
3131

32-
struct reftable_iterator_vtable empty_vtable = {
32+
static struct reftable_iterator_vtable empty_vtable = {
3333
.next = &empty_iterator_next,
3434
.close = &empty_iterator_close,
3535
};
@@ -126,7 +126,7 @@ static int filtering_ref_iterator_next(void *iter_arg,
126126
return err;
127127
}
128128

129-
struct reftable_iterator_vtable filtering_ref_iterator_vtable = {
129+
static struct reftable_iterator_vtable filtering_ref_iterator_vtable = {
130130
.next = &filtering_ref_iterator_next,
131131
.close = &filtering_ref_iterator_close,
132132
};
@@ -228,7 +228,7 @@ int new_indexed_table_ref_iter(struct indexed_table_ref_iter **dest,
228228
return err;
229229
}
230230

231-
struct reftable_iterator_vtable indexed_table_ref_iter_vtable = {
231+
static struct reftable_iterator_vtable indexed_table_ref_iter_vtable = {
232232
.next = &indexed_table_ref_iter_next,
233233
.close = &indexed_table_ref_iter_close,
234234
};

reftable/merged.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static int merged_iter_next_void(void *p, struct reftable_record *rec)
155155
return merged_iter_next(mi, rec);
156156
}
157157

158-
struct reftable_iterator_vtable merged_iter_vtable = {
158+
static struct reftable_iterator_vtable merged_iter_vtable = {
159159
.next = &merged_iter_next_void,
160160
.close = &merged_iter_close,
161161
};

reftable/publicbasics.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ int reftable_error_to_errno(int err)
5959
}
6060
}
6161

62-
void *(*reftable_malloc_ptr)(size_t sz) = &malloc;
63-
void *(*reftable_realloc_ptr)(void *, size_t) = &realloc;
64-
void (*reftable_free_ptr)(void *) = &free;
62+
static void *(*reftable_malloc_ptr)(size_t sz) = &malloc;
63+
static void *(*reftable_realloc_ptr)(void *, size_t) = &realloc;
64+
static void (*reftable_free_ptr)(void *) = &free;
6565

6666
void *reftable_malloc(size_t sz)
6767
{

reftable/reader.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ static void table_iter_close(void *p)
376376
block_iter_close(&ti->bi);
377377
}
378378

379-
struct reftable_iterator_vtable table_iter_vtable = {
379+
static struct reftable_iterator_vtable table_iter_vtable = {
380380
.next = &table_iter_next_void,
381381
.close = &table_iter_close,
382382
};

reftable/record.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ static int not_a_deletion(const void *p)
539539
return 0;
540540
}
541541

542-
struct reftable_record_vtable reftable_obj_record_vtable = {
542+
static struct reftable_record_vtable reftable_obj_record_vtable = {
543543
.key = &reftable_obj_record_key,
544544
.type = BLOCK_TYPE_OBJ,
545545
.copy_from = &reftable_obj_record_copy_from,
@@ -821,7 +821,7 @@ static int reftable_log_record_is_deletion_void(const void *p)
821821
(const struct reftable_log_record *)p);
822822
}
823823

824-
struct reftable_record_vtable reftable_log_record_vtable = {
824+
static struct reftable_record_vtable reftable_log_record_vtable = {
825825
.key = &reftable_log_record_key,
826826
.type = BLOCK_TYPE_LOG,
827827
.copy_from = &reftable_log_record_copy_from,
@@ -947,7 +947,7 @@ static int reftable_index_record_decode(void *rec, struct strbuf key,
947947
return start.len - in.len;
948948
}
949949

950-
struct reftable_record_vtable reftable_index_record_vtable = {
950+
static struct reftable_record_vtable reftable_index_record_vtable = {
951951
.key = &reftable_index_record_key,
952952
.type = BLOCK_TYPE_INDEX,
953953
.copy_from = &reftable_index_record_copy_from,

reftable/test_framework.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ license that can be found in the LICENSE file or at
1111
#include "system.h"
1212
#include "basics.h"
1313

14-
struct test_case **test_cases;
15-
int test_case_len;
16-
int test_case_cap;
14+
static struct test_case **test_cases;
15+
static int test_case_len;
16+
static int test_case_cap;
1717

1818
struct test_case *new_test_case(const char *name, void (*testfunc)(void))
1919
{
@@ -56,7 +56,7 @@ int test_main(int argc, const char *argv[])
5656
reftable_free(test_cases[i]);
5757
}
5858
reftable_free(test_cases);
59-
test_cases = 0;
59+
test_cases = NULL;
6060
test_case_len = 0;
6161
test_case_cap = 0;
6262
return 0;

reftable/writer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ void writer_clear_index(struct reftable_writer *w)
589589
w->index_cap = 0;
590590
}
591591

592-
const int debug = 0;
592+
static const int debug;
593593

594594
static int writer_flush_nonempty_block(struct reftable_writer *w)
595595
{

0 commit comments

Comments
 (0)