Re: [PATCH 2/2] Fix sparse warnings
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 21, 2011, 16:15 UTC
- Message-ID
- <7voc54sb41.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1300700704-22674-2-git-send-email-bebarino@gmail.com>
Stephen Boyd <bebarino@gmail.com> writes:
Show 12 quoted lines
> Fix warnings from 'make check'. > > diff.c:631:25: warning: symbol 'diff_words_styles' was not declared. > Should it be static? > notes-merge.c:362:73: warning: Using plain integer as NULL pointer > parse-options.c:564:6: error: symbol 'usage_with_options' redeclared > with different type (originally declared at parse-options.h:158) - > different modifiers > parse-options.c:571:6: error: symbol 'usage_msg_opt' redeclared with > different type (originally declared at parse-options.h:161) - different > modifiers > ...
Yuck. Could you summarize the errors by grouping them by type or something in the log? One mega-patch we can swallow, but the log is unreadble.
Show 9 quoted lines
> diff --git a/builtin/clone.c b/builtin/clone.c > index 02547ad..53ea012 100644 > --- a/builtin/clone.c > +++ b/builtin/clone.c > @@ -23,6 +23,7 @@ > #include "branch.h" > #include "remote.h" > #include "run-command.h" > +#include "builtin.h"
Documentation/CodingGuidelines suggests to move this to the top, probably replacing '#include "cache.h"' we have there:
- The first #include in C files, except in platform specific compat/ implementations, should be git-compat-util.h or another header file that includes it, such as cache.h or builtin.h.