ref-log: style fixes.

A few style fixes to get the code in line with the rest.

- asterisk to make a type a pointer to something goes in front
of the variable, not at the end of the base type.
E.g. a pointer to an integer is "int *ip", not "int* ip".

- open parenthesis for function parameter list, unlike
syntactic constructs, comes immediately after the function
name.  E.g. "if (foo) bar();" not "if(foo) bar ();".

- "else" does not come on the same line as the closing brace of
corresponding "if".

The style is mostly a matter of personal taste, and people may
disagree, but consistency is important.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/fetch.c b/fetch.c
index e040ef97b6b7e29d9e6482ad0ebead589e86a2a2..cf6c99490c234c5854146f8f6e72d8c615517eea 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -150,7 +150,8 @@ static int process(struct object *obj)
        if (has_sha1_file(obj->sha1)) {
                /* We already have it, so we should scan it now. */
                obj->flags |= TO_SCAN;
        if (has_sha1_file(obj->sha1)) {
                /* We already have it, so we should scan it now. */
                obj->flags |= TO_SCAN;

-       } else {
+       }
+       else {

                if (obj->flags & COMPLETE)
                        return 0;
                prefetch(obj->sha1);
                if (obj->flags & COMPLETE)
                        return 0;
                prefetch(obj->sha1);


@@ -255,7 +256,8 @@ int pull(char *target)
                if (write_ref_log_details) {
                        msg = xmalloc(strlen(write_ref_log_details) + 12);
                        sprintf(msg, "fetch from %s", write_ref_log_details);
                if (write_ref_log_details) {
                        msg = xmalloc(strlen(write_ref_log_details) + 12);
                        sprintf(msg, "fetch from %s", write_ref_log_details);

-               } else
+               }
+               else

                        msg = NULL;
                ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
                if (msg)
                        msg = NULL;
                ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
                if (msg)

diff --git a/refs.c b/refs.c
index 24dcba7189bdd9c1cdb4e1329f5676f43aa64467..f91b7716dc623b655fb56b359998b691d2ab6af6 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -259,7 +259,7 @@ int check_ref_format(const char *ref)
        }
 }
 
        }
 }
 

-static struct ref_lock* verify_lock(struct ref_lock *lock,
+static struct ref_lock *verify_lock(struct ref_lock *lock,

        const unsigned char *old_sha1, int mustexist)
 {
        char buf[40];
        const unsigned char *old_sha1, int mustexist)
 {
        char buf[40];


@@ -285,7 +285,7 @@ static struct ref_lock* verify_lock(struct ref_lock *lock,
        return lock;
 }
 
        return lock;
 }
 

-static struct ref_lock* lock_ref_sha1_basic(const char *path,
+static struct ref_lock *lock_ref_sha1_basic(const char *path,

        int plen,
        const unsigned char *old_sha1, int mustexist)
 {
        int plen,
        const unsigned char *old_sha1, int mustexist)
 {


@@ -320,7 +320,7 @@ static struct ref_lock* lock_ref_sha1_basic(const char *path,
        return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock;
 }
 
        return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock;
 }
 

-struct ref_lock* lock_ref_sha1(const char *ref,
+struct ref_lock *lock_ref_sha1(const char *ref,

        const unsigned char *old_sha1, int mustexist)
 {
        if (check_ref_format(ref))
        const unsigned char *old_sha1, int mustexist)
 {
        if (check_ref_format(ref))


@@ -329,14 +329,14 @@ struct ref_lock* lock_ref_sha1(const char *ref,
                5 + strlen(ref), old_sha1, mustexist);
 }
 
                5 + strlen(ref), old_sha1, mustexist);
 }
 

-struct ref_lock* lock_any_ref_for_update(const char *ref,
+struct ref_lock *lock_any_ref_for_update(const char *ref,

        const unsigned char *old_sha1, int mustexist)
 {
        return lock_ref_sha1_basic(git_path("%s", ref),
                strlen(ref), old_sha1, mustexist);
 }
 
        const unsigned char *old_sha1, int mustexist)
 {
        return lock_ref_sha1_basic(git_path("%s", ref),
                strlen(ref), old_sha1, mustexist);
 }
 

-void unlock_ref (struct ref_lock *lock)
+void unlock_ref(struct ref_lock *lock)

 {
        if (lock->lock_fd >= 0) {
                close(lock->lock_fd);
 {
        if (lock->lock_fd >= 0) {
                close(lock->lock_fd);


@@ -384,7 +384,8 @@ static int log_ref_write(struct ref_lock *lock,
                        sha1_to_hex(sha1),
                        comitter,
                        msg);
                        sha1_to_hex(sha1),
                        comitter,
                        msg);

-       } else {
+       }
+       else {

                maxlen = strlen(comitter) + 2*40 + 4;
                logrec = xmalloc(maxlen);
                len = snprintf(logrec, maxlen, "%s %s %s\n",
                maxlen = strlen(comitter) + 2*40 + 4;
                logrec = xmalloc(maxlen);
                len = snprintf(logrec, maxlen, "%s %s %s\n",


@@ -477,10 +478,12 @@ int read_ref_at(const char *ref, unsigned long at_time, unsigned char *sha1)
                                                "warning: Log %s has gap after %s.\n",
                                                logfile, show_rfc2822_date(date, tz));
                                }
                                                "warning: Log %s has gap after %s.\n",
                                                logfile, show_rfc2822_date(date, tz));
                                }

-                       } else if (date == at_time) {
+                       }
+                       else if (date == at_time) {

                                if (get_sha1_hex(rec + 41, sha1))
                                        die("Log %s is corrupt.", logfile);
                                if (get_sha1_hex(rec + 41, sha1))
                                        die("Log %s is corrupt.", logfile);

-                       } else {
+                       }
+                       else {

                                if (get_sha1_hex(rec + 41, logged_sha1))
                                        die("Log %s is corrupt.", logfile);
                                if (memcmp(logged_sha1, sha1, 20)) {
                                if (get_sha1_hex(rec + 41, logged_sha1))
                                        die("Log %s is corrupt.", logfile);
                                if (memcmp(logged_sha1, sha1, 20)) {

diff --git a/refs.h b/refs.h
index bc01691ec5b7fcfac82c6fec41a05608d2fecfa2..553155c04a4a3586e7a0f07f26979b50b9216aa3 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -24,13 +24,13 @@ extern int for_each_remote_ref(int (*fn)(const char *path, const unsigned char *
 extern int get_ref_sha1(const char *ref, unsigned char *sha1);
 
 /** Locks a "refs/" ref returning the lock on success and NULL on failure. **/
 extern int get_ref_sha1(const char *ref, unsigned char *sha1);
 
 /** Locks a "refs/" ref returning the lock on success and NULL on failure. **/

-extern struct ref_lock* lock_ref_sha1(const char *ref, const unsigned char *old_sha1, int mustexist);
+extern struct ref_lock *lock_ref_sha1(const char *ref, const unsigned char *old_sha1, int mustexist);

 
 /** Locks any ref (for 'HEAD' type refs). */
 
 /** Locks any ref (for 'HEAD' type refs). */

-extern struct ref_lock* lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int mustexist);
+extern struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int mustexist);

 
 /** Release any lock taken but not written. **/
 
 /** Release any lock taken but not written. **/

-extern void unlock_ref (struct ref_lock *lock);
+extern void unlock_ref(struct ref_lock *lock);

 
 /** Writes sha1 into the ref specified by the lock. **/
 extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg);
 
 /** Writes sha1 into the ref specified by the lock. **/
 extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg);