Remove whitespace breakage from *.h files
PATCH 2/6 Remove whitespace breakage from *.h files
Using 'git apply --whitespace=strip'
Signed-off-by Marco Costalba <[email protected]>
--- cache.h | 2 +- commit.h | 2 +- mozilla-sha1/sha1.h | 18 +++++++++--------- object.h | 2 +- rsh.h | 2 +- xdiff/xdiff.h | 1 - xdiff/xdiffi.h | 1 - xdiff/xemit.h | 1 - xdiff/xinclude.h | 1 - xdiff/xmacros.h | 1 - xdiff/xprepare.h | 1 - xdiff/xtypes.h | 1 - xdiff/xutils.h | 1 - 13 files changed, 13 insertions(+), 21 deletions(-)
cache.h +1 -1
@@ -480,7 +480,7 @@ extern void prepare_packed_git(void);extern void reprepare_packed_git (void );extern void install_packed_git (struct packed_git *pack); -extern struct packed_git *find_sha1_pack (const unsigned char *sha1, +extern struct packed_git *find_sha1_pack (const unsigned char *sha1,struct packed_git *packs);extern void pack_report (void );
commit.h +1 -1
@@ -66,7 +66,7 @@ extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit/** Removes the first commit from a list sorted by date, and adds all * of its parents. **/ -struct commit *pop_most_recent_commit (struct commit_list **list, +struct commit *pop_most_recent_commit (struct commit_list **list,unsigned int mark);struct commit *pop_commit (struct commit_list **stack);
mozilla-sha1/sha1.h +9 -9
@@ -1,29 +1,29 @@ -/* +/* * The contents of this file are subject to the Mozilla Public * License Version 1.1 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.mozilla.org/MPL/ -* +* * Software distributed under the License is distributed on an "AS * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. -* +* * The Original Code is SHA 180-1 Header File -* +* * The Initial Developer of the Original Code is Paul Kocher of -* Cryptography Research. Portions created by Paul Kocher are +* Cryptography Research. Portions created by Paul Kocher are * Copyright (C) 1995-9 by Cryptography Research, Inc. All * Rights Reserved. -* +* * Contributor(s): * * Paul Kocher -* +* * Alternatively, the contents of this file may be used under the * terms of the GNU General Public License Version 2 or later (the -* "GPL"), in which case the provisions of the GPL are applicable -* instead of those above. If you wish to allow use of your +* "GPL"), in which case the provisions of the GPL are applicable +* instead of those above. If you wish to allow use of your * version of this file only under the terms of the GPL and not to * allow others to use your version of this file under the MPL, * indicate your decision by deleting the provisions above and
object.h +1 -1
@@ -66,7 +66,7 @@ void set_object_refs(struct object *obj, struct object_refs *refs);void mark_reachable (struct object *obj,unsigned int mask); -struct object_list *object_list_insert (struct object *item, +struct object_list *object_list_insert (struct object *item,struct object_list **list_p); void object_list_append(struct object *item,
rsh.h +1 -1
@@ -1,7 +1,7 @@#ifndef RSH_H #define RSH_H -int setup_connection (int *fd_in,int *fd_out,const char *remote_prog, +int setup_connection (int *fd_in,int *fd_out,const char *remote_prog,char *url,int rmt_argc,char **rmt_argv);#endif
xdiff/xdiff.h +0 -1
@@ -103,4 +103,3 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,#endif /* #ifdef __cplusplus */ #endif /* #if !defined(XDIFF_H) */ -
xdiff/xdiffi.h +0 -1
@@ -57,4 +57,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, xdemitconf_t const *xecfg);#endif /* #if !defined(XDIFFI_H) */ -
xdiff/xemit.h +0 -1
@@ -31,4 +31,3 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,#endif /* #if !defined(XEMIT_H) */ -
xdiff/xinclude.h +0 -1
@@ -40,4 +40,3 @@#endif /* #if !defined(XINCLUDE_H) */ -
xdiff/xmacros.h +0 -1
@@ -51,4 +51,3 @@ do { \#endif /* #if !defined(XMACROS_H) */ -
xdiff/xprepare.h +0 -1
@@ -32,4 +32,3 @@ void xdl_free_env(xdfenv_t *xe);#endif /* #if !defined(XPREPARE_H) */ -
xdiff/xtypes.h +0 -1
@@ -65,4 +65,3 @@ typedef struct s_xdfenv {#endif /* #if !defined(XTYPES_H) */ -
xdiff/xutils.h +0 -1
@@ -45,4 +45,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,#endif /* #if !defined(XUTILS_H) */ -
Signature · 1 line
1.5.2.rc3.90.gf33e-dirty