revision: split some overly-long lines

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/revision.c b/revision.c
index 25e424cdb694a6f364a626c02aef6cf052999d94..8ac88d6798a2150954213564975a7a6327c7a66c 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -70,7 +70,8 @@ static int show_path_truncated(FILE *out, const struct name_path *path)
        return ours || emitted;
 }
 
        return ours || emitted;
 }
 

-void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
+void show_object_with_name(FILE *out, struct object *obj,
+                          const struct name_path *path, const char *component)

 {
        struct name_path leaf;
        leaf.up = (struct name_path *)path;
 {
        struct name_path leaf;
        leaf.up = (struct name_path *)path;


@@ -186,7 +187,9 @@ void mark_parents_uninteresting(struct commit *commit)
        }
 }
 
        }
 }
 

-static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
+static void add_pending_object_with_mode(struct rev_info *revs,
+                                        struct object *obj,
+                                        const char *name, unsigned mode)

 {
        if (!obj)
                return;
 {
        if (!obj)
                return;


@@ -209,7 +212,8 @@ static void add_pending_object_with_mode(struct rev_info *revs, struct object *o
        add_object_array_with_mode(obj, name, &revs->pending, mode);
 }
 
        add_object_array_with_mode(obj, name, &revs->pending, mode);
 }
 

-void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
+void add_pending_object(struct rev_info *revs,
+                       struct object *obj, const char *name)

 {
        add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
 }
 {
        add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
 }


@@ -226,7 +230,9 @@ void add_head_to_pending(struct rev_info *revs)
        add_pending_object(revs, obj, "HEAD");
 }
 
        add_pending_object(revs, obj, "HEAD");
 }
 

-static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
+static struct object *get_reference(struct rev_info *revs, const char *name,
+                                   const unsigned char *sha1,
+                                   unsigned int flags)

 {
        struct object *object;
 
 {
        struct object *object;
 


@@ -247,7 +253,8 @@ void add_pending_sha1(struct rev_info *revs, const char *name,
        add_pending_object(revs, object, name);
 }
 
        add_pending_object(revs, object, name);
 }
 

-static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
+static struct commit *handle_commit(struct rev_info *revs,
+                                   struct object *object, const char *name)

 {
        unsigned long flags = object->flags;
 
 {
        unsigned long flags = object->flags;
 


@@ -368,7 +375,8 @@ static void file_change(struct diff_options *options,
        DIFF_OPT_SET(options, HAS_CHANGES);
 }
 
        DIFF_OPT_SET(options, HAS_CHANGES);
 }
 

-static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
+static int rev_compare_tree(struct rev_info *revs,
+                           struct commit *parent, struct commit *commit)

 {
        struct tree *t1 = parent->tree;
        struct tree *t2 = commit->tree;
 {
        struct tree *t1 = parent->tree;
        struct tree *t2 = commit->tree;

diff --git a/revision.h b/revision.h
index 01bd2b7c07719c9628bba13e34b581dc1fdbc0af..96284651dba13f5c8a737a582cf37004f71c8f3a 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -195,19 +195,23 @@ struct setup_revision_opt {
 };
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);
 };
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);

-extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
+extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
+                          struct setup_revision_opt *);

 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,

-                                const struct option *options,
-                                const char * const usagestr[]);
+                              const struct option *options,
+                              const char * const usagestr[]);

 #define REVARG_CANNOT_BE_FILENAME 01
 #define REVARG_COMMITTISH 02
 #define REVARG_CANNOT_BE_FILENAME 01
 #define REVARG_COMMITTISH 02

-extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
+extern int handle_revision_arg(const char *arg, struct rev_info *revs,
+                              int flags, unsigned revarg_opt);

 
 extern void reset_revision_walk(void);
 extern int prepare_revision_walk(struct rev_info *revs);
 extern struct commit *get_revision(struct rev_info *revs);
 
 extern void reset_revision_walk(void);
 extern int prepare_revision_walk(struct rev_info *revs);
 extern struct commit *get_revision(struct rev_info *revs);

-extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
-extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
+extern char *get_revision_mark(const struct rev_info *revs,
+                              const struct commit *commit);
+extern void put_revision_mark(const struct rev_info *revs,
+                             const struct commit *commit);

 
 extern void mark_parents_uninteresting(struct commit *commit);
 extern void mark_tree_uninteresting(struct tree *tree);
 
 extern void mark_parents_uninteresting(struct commit *commit);
 extern void mark_tree_uninteresting(struct tree *tree);


@@ -220,15 +224,19 @@ struct name_path {
 
 char *path_name(const struct name_path *path, const char *name);
 
 
 char *path_name(const struct name_path *path, const char *name);
 

-extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
+extern void show_object_with_name(FILE *, struct object *,
+                                 const struct name_path *, const char *);

 
 extern void add_object(struct object *obj,
                       struct object_array *p,
                       struct name_path *path,
                       const char *name);
 
 
 extern void add_object(struct object *obj,
                       struct object_array *p,
                       struct name_path *path,
                       const char *name);
 

-extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
-extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
+extern void add_pending_object(struct rev_info *revs,
+                              struct object *obj, const char *name);
+extern void add_pending_sha1(struct rev_info *revs,
+                            const char *name, const unsigned char *sha1,
+                            unsigned int flags);

 
 extern void add_head_to_pending(struct rev_info *);
 
 
 extern void add_head_to_pending(struct rev_info *);
 


@@ -238,7 +246,9 @@ enum commit_action {
        commit_error
 };
 
        commit_error
 };
 

-extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
-extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
+extern enum commit_action get_commit_action(struct rev_info *revs,
+                                           struct commit *commit);
+extern enum commit_action simplify_commit(struct rev_info *revs,
+                                         struct commit *commit);

 
 #endif
 
 #endif