refs: remove unnecessary "extern" keywords
There's continuing work in this area, so clean up unneeded "extern" keywords rather than schlepping them around. Also split up some overlong lines and add parameter names in a couple of places. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Michael Haggerty committed
Mar 31, 2016 at 06:19 UTC
1354c9b2ded11a2bc24e04b98268a5969b44c666
1 file changed
+73
-61
refs.h
+73
-61
@@ -52,19 +52,19 @@
52
#define RESOLVE_REF_NO_RECURSE 0x02
53
#define RESOLVE_REF_ALLOW_BAD_NAME 0x04
54
55
-extern const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
56
- unsigned char *sha1, int *flags);
55
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
56
+ unsigned char *sha1, int *flags);
57
58
-extern char *resolve_refdup(const char *refname, int resolve_flags,
59
- unsigned char *sha1, int *flags);
58
+char *resolve_refdup(const char *refname, int resolve_flags,
59
+ unsigned char *sha1, int *flags);
60
61
-extern int read_ref_full(const char *refname, int resolve_flags,
62
- unsigned char *sha1, int *flags);
63
-extern int read_ref(const char *refname, unsigned char *sha1);
61
+int read_ref_full(const char *refname, int resolve_flags,
62
+ unsigned char *sha1, int *flags);
63
+int read_ref(const char *refname, unsigned char *sha1);
64
65
-extern int ref_exists(const char *refname);
65
+int ref_exists(const char *refname);
66
67
-extern int is_branch(const char *refname);
67
+int is_branch(const char *refname);
68
69
/*
70
* If refname is a non-symbolic reference that refers to a tag object,
@@ -74,24 +74,25 @@ extern int is_branch(const char *refname);
74
* Symbolic references are considered unpeelable, even if they
75
* ultimately resolve to a peelable tag.
76
*/
77
-extern int peel_ref(const char *refname, unsigned char *sha1);
77
+int peel_ref(const char *refname, unsigned char *sha1);
78
79
/**
80
* Resolve refname in the nested "gitlink" repository that is located
81
* at path. If the resolution is successful, return 0 and set sha1 to
82
* the name of the object; otherwise, return a non-zero value.
83
*/
84
-extern int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1);
84
+int resolve_gitlink_ref(const char *path, const char *refname,
85
+ unsigned char *sha1);
86
87
/*
88
* Return true iff abbrev_name is a possible abbreviation for
89
* full_name according to the rules defined by ref_rev_parse_rules in
90
* refs.c.
91
*/
91
-extern int refname_match(const char *abbrev_name, const char *full_name);
92
+int refname_match(const char *abbrev_name, const char *full_name);
93
93
-extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
94
-extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
94
+int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
95
+int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
96
97
/*
98
* A ref_transaction represents a collection of ref updates
@@ -182,38 +183,45 @@ typedef int each_ref_fn(const char *refname,
183
* modifies the reference also returns a nonzero value to immediately
184
* stop the iteration.
185
*/
185
-extern int head_ref(each_ref_fn fn, void *cb_data);
186
-extern int for_each_ref(each_ref_fn fn, void *cb_data);
187
-extern int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
188
-extern int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken);
189
-extern int for_each_tag_ref(each_ref_fn fn, void *cb_data);
190
-extern int for_each_branch_ref(each_ref_fn fn, void *cb_data);
191
-extern int for_each_remote_ref(each_ref_fn fn, void *cb_data);
192
-extern int for_each_replace_ref(each_ref_fn fn, void *cb_data);
193
-extern int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
194
-extern int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, const char *prefix, void *cb_data);
195
-
196
-extern int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
197
-extern int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
198
-extern int for_each_ref_in_submodule(const char *submodule, const char *prefix,
186
+int head_ref(each_ref_fn fn, void *cb_data);
187
+int for_each_ref(each_ref_fn fn, void *cb_data);
188
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
189
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
190
+ unsigned int broken);
191
+int for_each_tag_ref(each_ref_fn fn, void *cb_data);
192
+int for_each_branch_ref(each_ref_fn fn, void *cb_data);
193
+int for_each_remote_ref(each_ref_fn fn, void *cb_data);
194
+int for_each_replace_ref(each_ref_fn fn, void *cb_data);
195
+int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
196
+int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
197
+ const char *prefix, void *cb_data);
198
+
199
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
200
+int for_each_ref_submodule(const char *submodule,
201
+ each_ref_fn fn, void *cb_data);
202
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
203
each_ref_fn fn, void *cb_data);
200
-extern int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
201
-extern int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
202
-extern int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
204
+int for_each_tag_ref_submodule(const char *submodule,
205
+ each_ref_fn fn, void *cb_data);
206
+int for_each_branch_ref_submodule(const char *submodule,
207
+ each_ref_fn fn, void *cb_data);
208
+int for_each_remote_ref_submodule(const char *submodule,
209
+ each_ref_fn fn, void *cb_data);
210
204
-extern int head_ref_namespaced(each_ref_fn fn, void *cb_data);
205
-extern int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
211
+int head_ref_namespaced(each_ref_fn fn, void *cb_data);
212
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
213
214
/* can be used to learn about broken ref and symref */
208
-extern int for_each_rawref(each_ref_fn fn, void *cb_data);
215
+int for_each_rawref(each_ref_fn fn, void *cb_data);
216
217
static inline const char *has_glob_specials(const char *pattern)
218
{
219
return strpbrk(pattern, "?*[");
220
}
221
215
-extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
216
-extern void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames);
222
+void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
223
+void warn_dangling_symrefs(FILE *fp, const char *msg_fmt,
224
+ const struct string_list *refnames);
225
226
/*
227
* Flags for controlling behaviour of pack_refs()
@@ -245,13 +253,13 @@ int pack_refs(unsigned int flags);
253
int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
254
255
/** Reads log for the value of ref during at_time. **/
248
-extern int read_ref_at(const char *refname, unsigned int flags,
249
- unsigned long at_time, int cnt,
250
- unsigned char *sha1, char **msg,
251
- unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
256
+int read_ref_at(const char *refname, unsigned int flags,
257
+ unsigned long at_time, int cnt,
258
+ unsigned char *sha1, char **msg,
259
+ unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
260
261
/** Check if a particular reflog exists */
254
-extern int reflog_exists(const char *refname);
262
+int reflog_exists(const char *refname);
263
264
/*
265
* Delete the specified reference. If old_sha1 is non-NULL, then
@@ -260,21 +268,25 @@ extern int reflog_exists(const char *refname);
268
* exists, regardless of its old value. It is an error for old_sha1 to
269
* be NULL_SHA1. flags is passed through to ref_transaction_delete().
270
*/
263
-extern int delete_ref(const char *refname, const unsigned char *old_sha1,
264
- unsigned int flags);
271
+int delete_ref(const char *refname, const unsigned char *old_sha1,
272
+ unsigned int flags);
273
274
/*
275
* Delete the specified references. If there are any problems, emit
276
* errors but attempt to keep going (i.e., the deletes are not done in
277
* an all-or-nothing transaction).
278
*/
271
-extern int delete_refs(struct string_list *refnames);
279
+int delete_refs(struct string_list *refnames);
280
281
/** Delete a reflog */
274
-extern int delete_reflog(const char *refname);
282
+int delete_reflog(const char *refname);
283
284
/* iterate over reflog entries */
277
-typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, const char *, unsigned long, int, const char *, void *);
285
+typedef int each_reflog_ent_fn(
286
+ unsigned char *old_sha1, unsigned char *new_sha1,
287
+ const char *committer, unsigned long timestamp,
288
+ int tz, const char *msg, void *cb_data);
289
+
290
int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data);
291
int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data);
292
@@ -282,7 +294,7 @@ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void
294
* Calls the specified function for each reflog file until it returns nonzero,
295
* and returns the value
296
*/
285
-extern int for_each_reflog(each_ref_fn, void *);
297
+int for_each_reflog(each_ref_fn fn, void *cb_data);
298
299
#define REFNAME_ALLOW_ONELEVEL 1
300
#define REFNAME_REFSPEC_PATTERN 2
@@ -295,16 +307,16 @@ extern int for_each_reflog(each_ref_fn, void *);
307
* allow a single "*" wildcard character in the refspec. No leading or
308
* repeated slashes are accepted.
309
*/
298
-extern int check_refname_format(const char *refname, int flags);
310
+int check_refname_format(const char *refname, int flags);
311
300
-extern const char *prettify_refname(const char *refname);
312
+const char *prettify_refname(const char *refname);
313
302
-extern char *shorten_unambiguous_ref(const char *refname, int strict);
314
+char *shorten_unambiguous_ref(const char *refname, int strict);
315
316
/** rename ref, return 0 on success **/
305
-extern int rename_ref(const char *oldref, const char *newref, const char *logmsg);
317
+int rename_ref(const char *oldref, const char *newref, const char *logmsg);
318
307
-extern int create_symref(const char *refname, const char *target, const char *logmsg);
319
+int create_symref(const char *refname, const char *target, const char *logmsg);
320
321
/*
322
* Update HEAD of the specified gitdir.
@@ -313,7 +325,7 @@ extern int create_symref(const char *refname, const char *target, const char *lo
325
* $GIT_DIR points to.
326
* Return 0 if successful, non-zero otherwise.
327
* */
316
-extern int set_worktree_head_symref(const char *gitdir, const char *target);
328
+int set_worktree_head_symref(const char *gitdir, const char *target);
329
330
enum action_on_err {
331
UPDATE_REFS_MSG_ON_ERR,
@@ -463,7 +475,7 @@ int update_ref(const char *msg, const char *refname,
475
const unsigned char *new_sha1, const unsigned char *old_sha1,
476
unsigned int flags, enum action_on_err onerr);
477
466
-extern int parse_hide_refs_config(const char *var, const char *value, const char *);
478
+int parse_hide_refs_config(const char *var, const char *value, const char *);
479
480
/*
481
* Check whether a ref is hidden. If no namespace is set, both the first and
@@ -473,7 +485,7 @@ extern int parse_hide_refs_config(const char *var, const char *value, const char
485
* the ref is outside that namespace, the first parameter is NULL. The second
486
* parameter always points to the full ref name.
487
*/
476
-extern int ref_is_hidden(const char *, const char *);
488
+int ref_is_hidden(const char *, const char *);
489
490
enum ref_type {
491
REF_TYPE_PER_WORKTREE,
@@ -522,11 +534,11 @@ typedef void reflog_expiry_cleanup_fn(void *cb_data);
534
* enum expire_reflog_flags. The three function pointers are described
535
* above. On success, return zero.
536
*/
525
-extern int reflog_expire(const char *refname, const unsigned char *sha1,
526
- unsigned int flags,
527
- reflog_expiry_prepare_fn prepare_fn,
528
- reflog_expiry_should_prune_fn should_prune_fn,
529
- reflog_expiry_cleanup_fn cleanup_fn,
530
- void *policy_cb_data);
537
+int reflog_expire(const char *refname, const unsigned char *sha1,
538
+ unsigned int flags,
539
+ reflog_expiry_prepare_fn prepare_fn,
540
+ reflog_expiry_should_prune_fn should_prune_fn,
541
+ reflog_expiry_cleanup_fn cleanup_fn,
542
+ void *policy_cb_data);
543
544
#endif /* REFS_H */