{"thread":{"id":"8236","subject":"[PATCH 2/6] Remove whitespace breakage from *.h files","startedAt":"2007-05-20T10:27:05Z","lastAt":"2007-05-20T10:27:05Z","messageCount":1,"participants":["Marco Costalba"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"42689","messageId":"46502279.60408@gmail.com","threadId":"8236","inReplyTo":null,"subject":"[PATCH 2/6] Remove whitespace breakage from *.h files","fromName":"Marco Costalba","fromEmail":"mcostalba@gmail.com","sentAt":"2007-05-20T10:27:05Z","receivedAt":"2007-05-20T10:27:05Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"Using 'git apply --whitespace=strip'\n\nSigned-off-by: Marco Costalba <mcostalba@gmail.com>\n---\n  cache.h             |    2 +-\n  commit.h            |    2 +-\n  mozilla-sha1/sha1.h |   18 +++++++++---------\n  object.h            |    2 +-\n  rsh.h               |    2 +-\n  xdiff/xdiff.h       |    1 -\n  xdiff/xdiffi.h      |    1 -\n  xdiff/xemit.h       |    1 -\n  xdiff/xinclude.h    |    1 -\n  xdiff/xmacros.h     |    1 -\n  xdiff/xprepare.h    |    1 -\n  xdiff/xtypes.h      |    1 -\n  xdiff/xutils.h      |    1 -\n  13 files changed, 13 insertions(+), 21 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex 4204bc1..9720129 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -480,7 +480,7 @@ extern void prepare_packed_git(void);\n  extern void reprepare_packed_git(void);\n  extern void install_packed_git(struct packed_git *pack);\n\n-extern struct packed_git *find_sha1_pack(const unsigned char *sha1,\n+extern struct packed_git *find_sha1_pack(const unsigned char *sha1,\n  \t\t\t\t\t struct packed_git *packs);\n\n  extern void pack_report(void);\ndiff --git a/commit.h b/commit.h\nindex 86e8dca..75b43a5 100644\n--- a/commit.h\n+++ b/commit.h\n@@ -66,7 +66,7 @@ extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit\n  /** Removes the first commit from a list sorted by date, and adds all\n   * of its parents.\n   **/\n-struct commit *pop_most_recent_commit(struct commit_list **list,\n+struct commit *pop_most_recent_commit(struct commit_list **list,\n  \t\t\t\t      unsigned int mark);\n\n  struct commit *pop_commit(struct commit_list **stack);\ndiff --git a/mozilla-sha1/sha1.h b/mozilla-sha1/sha1.h\nindex 5d82afa..16f2d3d 100644\n--- a/mozilla-sha1/sha1.h\n+++ b/mozilla-sha1/sha1.h\n@@ -1,29 +1,29 @@\n-/*\n+/*\n   * The contents of this file are subject to the Mozilla Public\n   * License Version 1.1 (the \"License\"); you may not use this file\n   * except in compliance with the License. You may obtain a copy of\n   * the License at http://www.mozilla.org/MPL/\n- *\n+ *\n   * Software distributed under the License is distributed on an \"AS\n   * IS\" basis, WITHOUT WARRANTY OF ANY KIND, either express or\n   * implied. See the License for the specific language governing\n   * rights and limitations under the License.\n- *\n+ *\n   * The Original Code is SHA 180-1 Header File\n- *\n+ *\n   * The Initial Developer of the Original Code is Paul Kocher of\n- * Cryptography Research.  Portions created by Paul Kocher are\n+ * Cryptography Research.  Portions created by Paul Kocher are\n   * Copyright (C) 1995-9 by Cryptography Research, Inc.  All\n   * Rights Reserved.\n- *\n+ *\n   * Contributor(s):\n   *\n   *     Paul Kocher\n- *\n+ *\n   * Alternatively, the contents of this file may be used under the\n   * terms of the GNU General Public License Version 2 or later (the\n- * \"GPL\"), in which case the provisions of the GPL are applicable\n- * instead of those above.  If you wish to allow use of your\n+ * \"GPL\"), in which case the provisions of the GPL are applicable\n+ * instead of those above.  If you wish to allow use of your\n   * version of this file only under the terms of the GPL and not to\n   * allow others to use your version of this file under the MPL,\n   * indicate your decision by deleting the provisions above and\ndiff --git a/object.h b/object.h\nindex 94f19ee..397bbfa 100644\n--- a/object.h\n+++ b/object.h\n@@ -66,7 +66,7 @@ void set_object_refs(struct object *obj, struct object_refs *refs);\n\n  void mark_reachable(struct object *obj, unsigned int mask);\n\n-struct object_list *object_list_insert(struct object *item,\n+struct object_list *object_list_insert(struct object *item,\n  \t\t\t\t       struct object_list **list_p);\n\n  void object_list_append(struct object *item,\ndiff --git a/rsh.h b/rsh.h\nindex 3b41942..ee2f499 100644\n--- a/rsh.h\n+++ b/rsh.h\n@@ -1,7 +1,7 @@\n  #ifndef RSH_H\n  #define RSH_H\n\n-int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,\n+int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,\n  \t\t     char *url, int rmt_argc, char **rmt_argv);\n\n  #endif\ndiff --git a/xdiff/xdiff.h b/xdiff/xdiff.h\nindex e874a7c..9402bb0 100644\n--- a/xdiff/xdiff.h\n+++ b/xdiff/xdiff.h\n@@ -103,4 +103,3 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,\n  #endif /* #ifdef __cplusplus */\n\n  #endif /* #if !defined(XDIFF_H) */\n-\ndiff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h\nindex 472aeae..3e099dc 100644\n--- a/xdiff/xdiffi.h\n+++ b/xdiff/xdiffi.h\n@@ -57,4 +57,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,\n  \t\t  xdemitconf_t const *xecfg);\n\n  #endif /* #if !defined(XDIFFI_H) */\n-\ndiff --git a/xdiff/xemit.h b/xdiff/xemit.h\nindex e629417..440a739 100644\n--- a/xdiff/xemit.h\n+++ b/xdiff/xemit.h\n@@ -31,4 +31,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,\n\n\n  #endif /* #if !defined(XEMIT_H) */\n-\ndiff --git a/xdiff/xinclude.h b/xdiff/xinclude.h\nindex 04a9da8..526ccb3 100644\n--- a/xdiff/xinclude.h\n+++ b/xdiff/xinclude.h\n@@ -40,4 +40,3 @@\n\n\n  #endif /* #if !defined(XINCLUDE_H) */\n-\ndiff --git a/xdiff/xmacros.h b/xdiff/xmacros.h\nindex e2cd202..8ef232c 100644\n--- a/xdiff/xmacros.h\n+++ b/xdiff/xmacros.h\n@@ -51,4 +51,3 @@ do { \\\n\n\n  #endif /* #if !defined(XMACROS_H) */\n-\ndiff --git a/xdiff/xprepare.h b/xdiff/xprepare.h\nindex 344c569..8fb06a5 100644\n--- a/xdiff/xprepare.h\n+++ b/xdiff/xprepare.h\n@@ -32,4 +32,3 @@ void xdl_free_env(xdfenv_t *xe);\n\n\n  #endif /* #if !defined(XPREPARE_H) */\n-\ndiff --git a/xdiff/xtypes.h b/xdiff/xtypes.h\nindex 3593a66..2511aef 100644\n--- a/xdiff/xtypes.h\n+++ b/xdiff/xtypes.h\n@@ -65,4 +65,3 @@ typedef struct s_xdfenv {\n\n\n  #endif /* #if !defined(XTYPES_H) */\n-\ndiff --git a/xdiff/xutils.h b/xdiff/xutils.h\nindex 70d8b98..d5de829 100644\n--- a/xdiff/xutils.h\n+++ b/xdiff/xutils.h\n@@ -45,4 +45,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,\n\n\n  #endif /* #if !defined(XUTILS_H) */\n-\n-- \n1.5.2.rc3.90.gf33e-dirty\n"}]}