refs.c: change some "flags" to "unsigned int"
Change the following functions' "flags" arguments from "int" to "unsigned int": * ref_transaction_update() * ref_transaction_create() * ref_transaction_delete() * update_ref() * delete_ref() * lock_ref_sha1_basic() Also change the "flags" member in "struct ref_update" to unsigned. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Feb 17, 2015 at 18:00 UTC
fec14ec38ca65b13f9e0fcdb60f27674c6f9af70
4 files changed
+17
-16
builtin/update-ref.c
+2
-1
@@ -353,7 +353,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
353
{
354
const char *refname, *oldval;
355
unsigned char sha1[20], oldsha1[20];
356
- int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0, flags = 0;
356
+ int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0;
357
+ unsigned int flags = 0;
358
struct option options[] = {
359
OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")),
360
OPT_BOOL('d', NULL, &delete, N_("delete the reference")),
cache.h
+1
-1
@@ -568,7 +568,7 @@ extern void update_index_if_able(struct index_state *, struct lock_file *);
568
extern int hold_locked_index(struct lock_file *, int);
569
extern void set_alternate_index_output(const char *);
570
571
-extern int delete_ref(const char *, const unsigned char *sha1, int delopt);
571
+extern int delete_ref(const char *, const unsigned char *sha1, unsigned int flags);
572
573
/* Environment bits from configuration mechanism */
574
extern int trust_executable_bit;
refs.c
+9
-9
@@ -2256,7 +2256,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log)
2256
static struct ref_lock *lock_ref_sha1_basic(const char *refname,
2257
const unsigned char *old_sha1,
2258
const struct string_list *skip,
2259
- int flags, int *type_p)
2259
+ unsigned int flags, int *type_p)
2260
{
2261
char *ref_file;
2262
const char *orig_refname = refname;
@@ -2740,14 +2740,14 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
2740
return 0;
2741
}
2742
2743
-int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
2743
+int delete_ref(const char *refname, const unsigned char *sha1, unsigned int flags)
2744
{
2745
struct ref_transaction *transaction;
2746
struct strbuf err = STRBUF_INIT;
2747
2748
transaction = ref_transaction_begin(&err);
2749
if (!transaction ||
2750
- ref_transaction_delete(transaction, refname, sha1, delopt,
2750
+ ref_transaction_delete(transaction, refname, sha1, flags,
2751
sha1 && !is_null_sha1(sha1), NULL, &err) ||
2752
ref_transaction_commit(transaction, &err)) {
2753
error("%s", err.buf);
@@ -3571,7 +3571,7 @@ int for_each_reflog(each_ref_fn fn, void *cb_data)
3571
struct ref_update {
3572
unsigned char new_sha1[20];
3573
unsigned char old_sha1[20];
3574
- int flags; /* REF_NODEREF? */
3574
+ unsigned int flags; /* REF_NODEREF? */
3575
int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
3576
struct ref_lock *lock;
3577
int type;
@@ -3644,7 +3644,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
3644
const char *refname,
3645
const unsigned char *new_sha1,
3646
const unsigned char *old_sha1,
3647
- int flags, int have_old, const char *msg,
3647
+ unsigned int flags, int have_old, const char *msg,
3648
struct strbuf *err)
3649
{
3650
struct ref_update *update;
@@ -3678,7 +3678,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
3678
int ref_transaction_create(struct ref_transaction *transaction,
3679
const char *refname,
3680
const unsigned char *new_sha1,
3681
- int flags, const char *msg,
3681
+ unsigned int flags, const char *msg,
3682
struct strbuf *err)
3683
{
3684
return ref_transaction_update(transaction, refname, new_sha1,
@@ -3688,7 +3688,7 @@ int ref_transaction_create(struct ref_transaction *transaction,
3688
int ref_transaction_delete(struct ref_transaction *transaction,
3689
const char *refname,
3690
const unsigned char *old_sha1,
3691
- int flags, int have_old, const char *msg,
3691
+ unsigned int flags, int have_old, const char *msg,
3692
struct strbuf *err)
3693
{
3694
return ref_transaction_update(transaction, refname, null_sha1,
@@ -3697,7 +3697,7 @@ int ref_transaction_delete(struct ref_transaction *transaction,
3697
3698
int update_ref(const char *action, const char *refname,
3699
const unsigned char *sha1, const unsigned char *oldval,
3700
- int flags, enum action_on_err onerr)
3700
+ unsigned int flags, enum action_on_err onerr)
3701
{
3702
struct ref_transaction *t;
3703
struct strbuf err = STRBUF_INIT;
@@ -3781,7 +3781,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
3781
/* Acquire all locks while verifying old values */
3782
for (i = 0; i < n; i++) {
3783
struct ref_update *update = updates[i];
3784
- int flags = update->flags;
3784
+ unsigned int flags = update->flags;
3785
3786
if (is_null_sha1(update->new_sha1))
3787
flags |= REF_DELETING;
refs.h
+5
-5
@@ -276,7 +276,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
276
const char *refname,
277
const unsigned char *new_sha1,
278
const unsigned char *old_sha1,
279
- int flags, int have_old, const char *msg,
279
+ unsigned int flags, int have_old, const char *msg,
280
struct strbuf *err);
281
282
/*
@@ -291,7 +291,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
291
int ref_transaction_create(struct ref_transaction *transaction,
292
const char *refname,
293
const unsigned char *new_sha1,
294
- int flags, const char *msg,
294
+ unsigned int flags, const char *msg,
295
struct strbuf *err);
296
297
/*
@@ -305,7 +305,7 @@ int ref_transaction_create(struct ref_transaction *transaction,
305
int ref_transaction_delete(struct ref_transaction *transaction,
306
const char *refname,
307
const unsigned char *old_sha1,
308
- int flags, int have_old, const char *msg,
308
+ unsigned int flags, int have_old, const char *msg,
309
struct strbuf *err);
310
311
/*
@@ -328,8 +328,8 @@ void ref_transaction_free(struct ref_transaction *transaction);
328
329
/** Lock a ref and then write its file */
330
int update_ref(const char *action, const char *refname,
331
- const unsigned char *sha1, const unsigned char *oldval,
332
- int flags, enum action_on_err onerr);
331
+ const unsigned char *sha1, const unsigned char *oldval,
332
+ unsigned int flags, enum action_on_err onerr);
333
334
extern int parse_hide_refs_config(const char *var, const char *value, const char *);
335
extern int ref_is_hidden(const char *);