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>

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 2497ba4303a03fa244b4f3913c22b45acd0a989c..9a1659e11eba303f93924f3a0866b8955564652c 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -353,7 +353,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 {
        const char *refname, *oldval;
        unsigned char sha1[20], oldsha1[20];
 {
        const char *refname, *oldval;
        unsigned char sha1[20], oldsha1[20];

-       int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0, flags = 0;
+       int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0;
+       unsigned int flags = 0;

        struct option options[] = {
                OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")),
                OPT_BOOL('d', NULL, &delete, N_("delete the reference")),
        struct option options[] = {
                OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")),
                OPT_BOOL('d', NULL, &delete, N_("delete the reference")),

diff --git a/cache.h b/cache.h
index f704af5df0984e092fe318e535596921c4ea7122..ab265be1cd0c042e1c83c341e6f4bd39be169d1e 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -568,7 +568,7 @@ extern void update_index_if_able(struct index_state *, struct lock_file *);
 extern int hold_locked_index(struct lock_file *, int);
 extern void set_alternate_index_output(const char *);
 
 extern int hold_locked_index(struct lock_file *, int);
 extern void set_alternate_index_output(const char *);
 

-extern int delete_ref(const char *, const unsigned char *sha1, int delopt);
+extern int delete_ref(const char *, const unsigned char *sha1, unsigned int flags);

 
 /* Environment bits from configuration mechanism */
 extern int trust_executable_bit;
 
 /* Environment bits from configuration mechanism */
 extern int trust_executable_bit;

diff --git a/refs.c b/refs.c
index 4de13833c8c5967fcb8a580ee7a1b57178beb0df..a203e44559b5bbc0a63527b5086e9343fa136cac 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2256,7 +2256,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log)
 static struct ref_lock *lock_ref_sha1_basic(const char *refname,
                                            const unsigned char *old_sha1,
                                            const struct string_list *skip,
 static struct ref_lock *lock_ref_sha1_basic(const char *refname,
                                            const unsigned char *old_sha1,
                                            const struct string_list *skip,

-                                           int flags, int *type_p)
+                                           unsigned int flags, int *type_p)

 {
        char *ref_file;
        const char *orig_refname = refname;
 {
        char *ref_file;
        const char *orig_refname = refname;


@@ -2740,14 +2740,14 @@ static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
        return 0;
 }
 
        return 0;
 }
 

-int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
+int delete_ref(const char *refname, const unsigned char *sha1, unsigned int flags)

 {
        struct ref_transaction *transaction;
        struct strbuf err = STRBUF_INIT;
 
        transaction = ref_transaction_begin(&err);
        if (!transaction ||
 {
        struct ref_transaction *transaction;
        struct strbuf err = STRBUF_INIT;
 
        transaction = ref_transaction_begin(&err);
        if (!transaction ||

-           ref_transaction_delete(transaction, refname, sha1, delopt,
+           ref_transaction_delete(transaction, refname, sha1, flags,

                                   sha1 && !is_null_sha1(sha1), NULL, &err) ||
            ref_transaction_commit(transaction, &err)) {
                error("%s", err.buf);
                                   sha1 && !is_null_sha1(sha1), NULL, &err) ||
            ref_transaction_commit(transaction, &err)) {
                error("%s", err.buf);


@@ -3571,7 +3571,7 @@ int for_each_reflog(each_ref_fn fn, void *cb_data)
 struct ref_update {
        unsigned char new_sha1[20];
        unsigned char old_sha1[20];
 struct ref_update {
        unsigned char new_sha1[20];
        unsigned char old_sha1[20];

-       int flags; /* REF_NODEREF? */
+       unsigned int flags; /* REF_NODEREF? */

        int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
        struct ref_lock *lock;
        int type;
        int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
        struct ref_lock *lock;
        int type;


@@ -3644,7 +3644,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *new_sha1,
                           const unsigned char *old_sha1,
                           const char *refname,
                           const unsigned char *new_sha1,
                           const unsigned char *old_sha1,

-                          int flags, int have_old, const char *msg,
+                          unsigned int flags, int have_old, const char *msg,

                           struct strbuf *err)
 {
        struct ref_update *update;
                           struct strbuf *err)
 {
        struct ref_update *update;


@@ -3678,7 +3678,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
 int ref_transaction_create(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *new_sha1,
 int ref_transaction_create(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *new_sha1,

-                          int flags, const char *msg,
+                          unsigned int flags, const char *msg,

                           struct strbuf *err)
 {
        return ref_transaction_update(transaction, refname, new_sha1,
                           struct strbuf *err)
 {
        return ref_transaction_update(transaction, refname, new_sha1,


@@ -3688,7 +3688,7 @@ int ref_transaction_create(struct ref_transaction *transaction,
 int ref_transaction_delete(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *old_sha1,
 int ref_transaction_delete(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *old_sha1,

-                          int flags, int have_old, const char *msg,
+                          unsigned int flags, int have_old, const char *msg,

                           struct strbuf *err)
 {
        return ref_transaction_update(transaction, refname, null_sha1,
                           struct strbuf *err)
 {
        return ref_transaction_update(transaction, refname, null_sha1,


@@ -3697,7 +3697,7 @@ int ref_transaction_delete(struct ref_transaction *transaction,
 
 int update_ref(const char *action, const char *refname,
               const unsigned char *sha1, const unsigned char *oldval,
 
 int update_ref(const char *action, const char *refname,
               const unsigned char *sha1, const unsigned char *oldval,

-              int flags, enum action_on_err onerr)
+              unsigned int flags, enum action_on_err onerr)

 {
        struct ref_transaction *t;
        struct strbuf err = STRBUF_INIT;
 {
        struct ref_transaction *t;
        struct strbuf err = STRBUF_INIT;


@@ -3781,7 +3781,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
        /* Acquire all locks while verifying old values */
        for (i = 0; i < n; i++) {
                struct ref_update *update = updates[i];
        /* Acquire all locks while verifying old values */
        for (i = 0; i < n; i++) {
                struct ref_update *update = updates[i];

-               int flags = update->flags;
+               unsigned int flags = update->flags;

 
                if (is_null_sha1(update->new_sha1))
                        flags |= REF_DELETING;
 
                if (is_null_sha1(update->new_sha1))
                        flags |= REF_DELETING;

diff --git a/refs.h b/refs.h
index 9bf214880f3641a60d724e566c716f989da037cc..92b85979c1239bbb67003e9c525c6f4e96e4024d 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -276,7 +276,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *new_sha1,
                           const unsigned char *old_sha1,
                           const char *refname,
                           const unsigned char *new_sha1,
                           const unsigned char *old_sha1,

-                          int flags, int have_old, const char *msg,
+                          unsigned int flags, int have_old, const char *msg,

                           struct strbuf *err);
 
 /*
                           struct strbuf *err);
 
 /*


@@ -291,7 +291,7 @@ int ref_transaction_update(struct ref_transaction *transaction,
 int ref_transaction_create(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *new_sha1,
 int ref_transaction_create(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *new_sha1,

-                          int flags, const char *msg,
+                          unsigned int flags, const char *msg,

                           struct strbuf *err);
 
 /*
                           struct strbuf *err);
 
 /*


@@ -305,7 +305,7 @@ int ref_transaction_create(struct ref_transaction *transaction,
 int ref_transaction_delete(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *old_sha1,
 int ref_transaction_delete(struct ref_transaction *transaction,
                           const char *refname,
                           const unsigned char *old_sha1,

-                          int flags, int have_old, const char *msg,
+                          unsigned int flags, int have_old, const char *msg,

                           struct strbuf *err);
 
 /*
                           struct strbuf *err);
 
 /*


@@ -328,8 +328,8 @@ void ref_transaction_free(struct ref_transaction *transaction);
 
 /** Lock a ref and then write its file */
 int update_ref(const char *action, const char *refname,
 
 /** Lock a ref and then write its file */
 int update_ref(const char *action, const char *refname,

-               const unsigned char *sha1, const unsigned char *oldval,
-               int flags, enum action_on_err onerr);
+              const unsigned char *sha1, const unsigned char *oldval,
+              unsigned int flags, enum action_on_err onerr);

 
 extern int parse_hide_refs_config(const char *var, const char *value, const char *);
 extern int ref_is_hidden(const char *);
 
 extern int parse_hide_refs_config(const char *var, const char *value, const char *);
 extern int ref_is_hidden(const char *);