delta/git.git/test-parse-options.c, branch jk/robustify-parse-commit

sparse: Fix mingw_main() argument number/type errors

2013-04-28T19:32:08+00:00

Sparse issues 68 errors (two errors for each main() function) such
as the following:

      SP git.c
  git.c:510:5: error: too many arguments for function mingw_main
  git.c:510:5: error: symbol 'mingw_main' redeclared with different type \
    (originally declared at git.c:510) - different argument counts

The errors are caused by the 'main' macro used by the MinGW build
to provide a replacement main() function. The original main function
is effectively renamed to 'mingw_main' and is called from the new
main function. The replacement main is used to execute certain actions
common to all git programs on MinGW (e.g. ensure the standard I/O
streams are in binary mode).

In order to suppress the errors, we change the macro to include the
parameters in the declaration of the mingw_main function.

Unfortunately, this change provokes both sparse and gcc to complain
about 9 calls to mingw_main(), such as the following:

      CC git.o
  git.c: In function 'main':
  git.c:510: warning: passing argument 2 of 'mingw_main' from \
    incompatible pointer type
  git.c:510: note: expected 'const char **' but argument is of \
    type 'char **'

In order to suppress these warnings, since both of the main
functions need to be declared with the same prototype, we
change the declaration of the 9 main functions, thus:

    int main(int argc, char **argv)

Signed-off-by: Ramsay Jones 
Signed-off-by: Junio C Hamano

test-parse-options: convert to OPT_BOOL()

2012-02-26T23:18:41+00:00

Introduce OPT_BOOL() to test-parse-options and add some tests for
these "true" boolean options. Rename OPT_BOOLEAN to OPT_COUNTUP and
OPTION_BOOLEAN to OPTION_COUNTUP as well.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

parseopt: add OPT_NOOP_NOARG

2011-09-28T19:46:21+00:00

Add OPT_NOOP_NOARG, a helper macro to define deprecated options in a
standard way.  The help text is taken from the no-op option -r of
git revert.

The callback could be made to emit a (conditional?) warning later.  And
we could also add OPT_NOOP (requiring an argument) etc. as needed.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

parse-options: add OPT_STRING_LIST helper

2011-06-22T18:25:20+00:00

This just adds repeated invocations of an option to a list
of strings. Using the "--no-" form will reset the list
to empty.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Make lowercase as per CodingGuidelines

2011-02-15T19:53:11+00:00

*.c part for matches with '<[A-Z]+>' (and affected test).

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

add description parameter to OPT__QUIET

2010-11-15T17:58:13+00:00

Allows better help text to be defined than "be quiet".  Also make use
of the macro in a place that already had a different description.  No
object code changes intended.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

add description parameter to OPT__DRY_RUN

2010-11-15T17:57:37+00:00

Allows better help text to be defined than "dry run".  Also make use
of the macro in places that already had a different description.  No
object code changes intended.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

add description parameter to OPT__VERBOSE

2010-11-15T17:56:51+00:00

Allows better help text to be defined than "be verbose".  Also make use
of the macro in places that already had a different description.  No
object code changes intended.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

parse-opt: ignore negation of OPT_NONEG for ambiguity checks

2009-09-29T14:28:47+00:00

parse_long_opt always matches both --opt and --no-opt for any option
"opt", and only get_value checks whether --no-opt is actually valid.
Since the options for git branch contains both "no-merged" and "merged"
there are two matches for --no-merge, but no exact match.  With this
patch the negation of a NONEG option is rejected earlier, but it changes
the error message from "option `no-opt' isn't available" to "unknown
option `no-opt'".

[jk: added test]

Signed-off-by: Andreas Schwab 
Signed-off-by: Jeff King 
Signed-off-by: Shawn O. Pearce

Fix various sparse warnings in the git source code

2009-06-21T04:52:55+00:00

There are a few remaining ones, but this fixes the trivial ones. It boils
down to two main issues that sparse complains about:

 - warning: Using plain integer as NULL pointer

   Sparse doesn't like you using '0' instead of 'NULL'. For various good
   reasons, not the least of which is just the visual confusion. A NULL
   pointer is not an integer, and that whole "0 works as NULL" is a
   historical accident and not very pretty.

   A few of these remain: zlib is a total mess, and Z_NULL is just a 0.
   I didn't touch those.

 - warning: symbol 'xyz' was not declared. Should it be static?

   Sparse wants to see declarations for any functions you export. A lack
   of a declaration tends to mean that you should either add one, or you
   should mark the function 'static' to show that it's in file scope.

   A few of these remain: I only did the ones that should obviously just
   be made static.

That 'wt_status_submodule_summary' one is debatable. It has a few related
flags (like 'wt_status_use_color') which _are_ declared, and are used by
builtin-commit.c. So maybe we'd like to export it at some point, but it's
not declared now, and not used outside of that file, so 'static' it is in
this patch.

Signed-off-by: Linus Torvalds 
Signed-off-by: Junio C Hamano