Re: [PATCH 08/17] revision: split some overly-long lines

2013-05-23 Thread Michael Haggerty 
On 05/21/2013 07:34 PM, Junio C Hamano wrote:
 Michael Haggerty mhag...@alum.mit.edu writes:
 
 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
 ---
  revision.c | 20 ++--
  revision.h | 32 +---
  2 files changed, 35 insertions(+), 17 deletions(-)
 
 Looks obviously good for *.c file, but I am on the fence for *.h
 one, as the reason we kept these long single lines in *.h files was
 to help those who want to grep in *.h files to let them view the
 full function signature.  It probably is OK to tell them to use
 git grep -A$n instead, though.

My goal with this patch was not to set a new policy but rather just to
make the code conform a little better to the existing policy as
described in CodingGuidelines.  *If* it is preferred that header files
list all parameters on a single line, then by all means adjust the
CodingGuidelines and I will just as happily make header files conform to
*that* policy when I touch them :-)

(That being said, my personal preference is to apply the 80-character
limit for header files too.)

Michael

-- 
Michael Haggerty
mhag...@alum.mit.edu
http://softwareswirl.blogspot.com/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 08/17] revision: split some overly-long lines

2013-05-23 Thread Junio C Hamano 
Michael Haggerty mhag...@alum.mit.edu writes:

 On 05/21/2013 07:34 PM, Junio C Hamano wrote:
 Michael Haggerty mhag...@alum.mit.edu writes:
 
 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
 ---
  revision.c | 20 ++--
  revision.h | 32 +---
  2 files changed, 35 insertions(+), 17 deletions(-)
 
 Looks obviously good for *.c file, but I am on the fence for *.h
 one, as the reason we kept these long single lines in *.h files was
 to help those who want to grep in *.h files to let them view the
 full function signature.  It probably is OK to tell them to use
 git grep -A$n instead, though.

 My goal with this patch was not to set a new policy but rather just to
 make the code conform a little better to the existing policy as
 described in CodingGuidelines.  *If* it is preferred that header files
 list all parameters on a single line, then by all means adjust the
 CodingGuidelines and I will just as happily make header files conform to
 *that* policy when I touch them :-)

 (That being said, my personal preference is to apply the 80-character
 limit for header files too.)

Yeah, that is why I said I am on the fence but it probably is OK to
break the unwritten but guessable rule.

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 08/17] revision: split some overly-long lines

2013-05-21 Thread Junio C Hamano 
Michael Haggerty mhag...@alum.mit.edu writes:

 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
 ---
  revision.c | 20 ++--
  revision.h | 32 +---
  2 files changed, 35 insertions(+), 17 deletions(-)

Looks obviously good for *.c file, but I am on the fence for *.h
one, as the reason we kept these long single lines in *.h files was
to help those who want to grep in *.h files to let them view the
full function signature.  It probably is OK to tell them to use
git grep -A$n instead, though.

 diff --git a/revision.c b/revision.c
 index 25e424c..8ac88d6 100644
 --- 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;
  }
  
 -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;
 @@ -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;
 @@ -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);
  }
  
 -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);
  }
 @@ -226,7 +230,9 @@ void add_head_to_pending(struct rev_info *revs)
   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;
  
 @@ -247,7 +253,8 @@ void add_pending_sha1(struct rev_info *revs, const char 
 *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;
  
 @@ -368,7 +375,8 @@ static void file_change(struct diff_options *options,
   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;
 diff --git a/revision.h b/revision.h
 index 01bd2b7..9628465 100644
 --- 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 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,
 -  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
 -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 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

[PATCH 08/17] revision: split some overly-long lines

2013-05-19 Thread Michael Haggerty 

Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
 revision.c | 20 ++--
 revision.h | 32 +---
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/revision.c b/revision.c
index 25e424c..8ac88d6 100644
--- 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;
 }
 
-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;
@@ -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;
@@ -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);
 }
 
-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);
 }
@@ -226,7 +230,9 @@ void add_head_to_pending(struct rev_info *revs)
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;
 
@@ -247,7 +253,8 @@ void add_pending_sha1(struct rev_info *revs, const char 
*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;
 
@@ -368,7 +375,8 @@ static void file_change(struct diff_options *options,
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;
diff --git a/revision.h b/revision.h
index 01bd2b7..9628465 100644
--- 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 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,
-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
-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 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);
@@ -220,15 +224,19 @@ struct name_path {
 
 char *path_name(const struct name_path *path, const char *name);
 
-extern void show_object_with_name(FILE *, struct object *, const