packfile.h: drop extern from function declarations
As CodingGuidelines recommends, we do not need an "extern" when declaring a public function. Let's drop these. Note that we leave the extern on report_garbage(), as that is actually a function pointer, not a function itself. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Apr 5, 2019 at 14:03 UTC
336226c259f3fa2e2c9c1f5ce857f0c163b26928
1 file changed
+41
-41
packfile.h
+41
-41
@@ -15,23 +15,23 @@ struct object_info;
15
*
16
* Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
17
*/
18
-extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
18
+char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
19
20
/*
21
* Return the name of the (local) packfile with the specified sha1 in
22
* its name. The return value is a pointer to memory that is
23
* overwritten each time this function is called.
24
*/
25
-extern char *sha1_pack_name(const unsigned char *sha1);
25
+char *sha1_pack_name(const unsigned char *sha1);
26
27
/*
28
* Return the name of the (local) pack index file with the specified
29
* sha1 in its name. The return value is a pointer to memory that is
30
* overwritten each time this function is called.
31
*/
32
-extern char *sha1_pack_index_name(const unsigned char *sha1);
32
+char *sha1_pack_index_name(const unsigned char *sha1);
33
34
-extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
34
+struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
35
36
typedef void each_file_in_pack_dir_fn(const char *full_path, size_t full_path_len,
37
const char *file_pach, void *data);
@@ -45,8 +45,8 @@ void for_each_file_in_pack_dir(const char *objdir,
45
#define PACKDIR_FILE_GARBAGE 4
46
extern void (*report_garbage)(unsigned seen_bits, const char *path);
47
48
-extern void reprepare_packed_git(struct repository *r);
49
-extern void install_packed_git(struct repository *r, struct packed_git *pack);
48
+void reprepare_packed_git(struct repository *r);
49
+void install_packed_git(struct repository *r, struct packed_git *pack);
50
51
struct packed_git *get_packed_git(struct repository *r);
52
struct list_head *get_packed_git_mru(struct repository *r);
@@ -59,32 +59,32 @@ struct packed_git *get_all_packs(struct repository *r);
59
*/
60
unsigned long approximate_object_count(void);
61
62
-extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
63
- struct packed_git *packs);
62
+struct packed_git *find_sha1_pack(const unsigned char *sha1,
63
+ struct packed_git *packs);
64
65
-extern void pack_report(void);
65
+void pack_report(void);
66
67
/*
68
* mmap the index file for the specified packfile (if it is not
69
* already mmapped). Return 0 on success.
70
*/
71
-extern int open_pack_index(struct packed_git *);
71
+int open_pack_index(struct packed_git *);
72
73
/*
74
* munmap the index file for the specified packfile (if it is
75
* currently mmapped).
76
*/
77
-extern void close_pack_index(struct packed_git *);
77
+void close_pack_index(struct packed_git *);
78
79
-extern uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
79
+uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
80
81
-extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
82
-extern void close_pack_windows(struct packed_git *);
83
-extern void close_pack(struct packed_git *);
84
-extern void close_all_packs(struct raw_object_store *o);
85
-extern void unuse_pack(struct pack_window **);
86
-extern void clear_delta_base_cache(void);
87
-extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
81
+unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
82
+void close_pack_windows(struct packed_git *);
83
+void close_pack(struct packed_git *);
84
+void close_all_packs(struct raw_object_store *o);
85
+void unuse_pack(struct pack_window **);
86
+void clear_delta_base_cache(void);
87
+struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
88
89
/*
90
* Make sure that a pointer access into an mmap'd index file is within bounds,
@@ -94,7 +94,7 @@ extern struct packed_git *add_packed_git(const char *path, size_t path_len, int
94
* (like the 64-bit extended offset table), as we compare the size to the
95
* fixed-length parts when we open the file.
96
*/
97
-extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
97
+void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
98
99
/*
100
* Perform binary search on a pack-index for a given oid. Packfile is expected to
@@ -110,59 +110,59 @@ int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32
110
* at the SHA-1 within the mmapped index. Return NULL if there is an
111
* error.
112
*/
113
-extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
113
+const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
114
/*
115
* Like nth_packed_object_sha1, but write the data into the object specified by
116
* the the first argument. Returns the first argument on success, and NULL on
117
* error.
118
*/
119
-extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
119
+const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
120
121
/*
122
* Return the offset of the nth object within the specified packfile.
123
* The index must already be opened.
124
*/
125
-extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
125
+off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
126
127
/*
128
* If the object named sha1 is present in the specified packfile,
129
* return its offset within the packfile; otherwise, return 0.
130
*/
131
-extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
131
+off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
132
133
-extern int is_pack_valid(struct packed_git *);
134
-extern void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object_type *, unsigned long *);
135
-extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
136
-extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
137
-extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
133
+int is_pack_valid(struct packed_git *);
134
+void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object_type *, unsigned long *);
135
+unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
136
+unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
137
+int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
138
139
-extern void release_pack_memory(size_t);
139
+void release_pack_memory(size_t);
140
141
/* global flag to enable extra checks when accessing packed objects */
142
extern int do_check_packed_object_crc;
143
144
-extern int packed_object_info(struct repository *r,
145
- struct packed_git *pack,
146
- off_t offset, struct object_info *);
144
+int packed_object_info(struct repository *r,
145
+ struct packed_git *pack,
146
+ off_t offset, struct object_info *);
147
148
-extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
149
-extern const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
148
+void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
149
+const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
150
151
/*
152
* Iff a pack file in the given repository contains the object named by sha1,
153
* return true and store its location to e.
154
*/
155
-extern int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e);
155
+int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e);
156
157
-extern int has_object_pack(const struct object_id *oid);
157
+int has_object_pack(const struct object_id *oid);
158
159
-extern int has_pack_index(const unsigned char *sha1);
159
+int has_pack_index(const unsigned char *sha1);
160
161
/*
162
* Return 1 if an object in a promisor packfile is or refers to the given
163
* object, 0 otherwise.
164
*/
165
-extern int is_promisor_object(const struct object_id *oid);
165
+int is_promisor_object(const struct object_id *oid);
166
167
/*
168
* Expose a function for fuzz testing.
@@ -174,7 +174,7 @@ extern int is_promisor_object(const struct object_id *oid);
174
* have a convenient entry-point for fuzz testing. For real uses, you should
175
* probably use open_pack_index() or parse_pack_index() instead.
176
*/
177
-extern int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
178
- size_t idx_size, struct packed_git *p);
177
+int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
178
+ size_t idx_size, struct packed_git *p);
179
180
#endif