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 <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			88 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			88 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "cache.h"
 | 
						|
#include "parse-options.h"
 | 
						|
 | 
						|
static int boolean = 0;
 | 
						|
static int integer = 0;
 | 
						|
static unsigned long timestamp;
 | 
						|
static int abbrev = 7;
 | 
						|
static int verbose = 0, dry_run = 0, quiet = 0;
 | 
						|
static char *string = NULL;
 | 
						|
static char *file = NULL;
 | 
						|
 | 
						|
static int length_callback(const struct option *opt, const char *arg, int unset)
 | 
						|
{
 | 
						|
	printf("Callback: \"%s\", %d\n",
 | 
						|
		(arg ? arg : "not set"), unset);
 | 
						|
	if (unset)
 | 
						|
		return 1; /* do not support unset */
 | 
						|
 | 
						|
	*(int *)opt->value = strlen(arg);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int number_callback(const struct option *opt, const char *arg, int unset)
 | 
						|
{
 | 
						|
	*(int *)opt->value = strtol(arg, NULL, 10);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
int main(int argc, const char **argv)
 | 
						|
{
 | 
						|
	const char *prefix = "prefix/";
 | 
						|
	const char *usage[] = {
 | 
						|
		"test-parse-options <options>",
 | 
						|
		NULL
 | 
						|
	};
 | 
						|
	struct option options[] = {
 | 
						|
		OPT_BOOLEAN('b', "boolean", &boolean, "get a boolean"),
 | 
						|
		OPT_BIT('4', "or4", &boolean,
 | 
						|
			"bitwise-or boolean with ...0100", 4),
 | 
						|
		OPT_NEGBIT(0, "neg-or4", &boolean, "same as --no-or4", 4),
 | 
						|
		OPT_GROUP(""),
 | 
						|
		OPT_INTEGER('i', "integer", &integer, "get a integer"),
 | 
						|
		OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
 | 
						|
		OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
 | 
						|
		OPT_DATE('t', NULL, ×tamp, "get timestamp of <time>"),
 | 
						|
		OPT_CALLBACK('L', "length", &integer, "str",
 | 
						|
			"get length of <str>", length_callback),
 | 
						|
		OPT_FILENAME('F', "file", &file, "set file to <FILE>"),
 | 
						|
		OPT_GROUP("String options"),
 | 
						|
		OPT_STRING('s', "string", &string, "string", "get a string"),
 | 
						|
		OPT_STRING(0, "string2", &string, "str", "get another string"),
 | 
						|
		OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"),
 | 
						|
		OPT_STRING('o', NULL, &string, "str", "get another string"),
 | 
						|
		OPT_SET_PTR(0, "default-string", &string,
 | 
						|
			"set string to default", (unsigned long)"default"),
 | 
						|
		OPT_GROUP("Magic arguments"),
 | 
						|
		OPT_ARGUMENT("quux", "means --quux"),
 | 
						|
		OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
 | 
						|
			number_callback),
 | 
						|
		{ OPTION_BOOLEAN, '+', NULL, &boolean, NULL, "same as -b",
 | 
						|
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH },
 | 
						|
		OPT_GROUP("Standard options"),
 | 
						|
		OPT__ABBREV(&abbrev),
 | 
						|
		OPT__VERBOSE(&verbose),
 | 
						|
		OPT__DRY_RUN(&dry_run),
 | 
						|
		OPT__QUIET(&quiet),
 | 
						|
		OPT_END(),
 | 
						|
	};
 | 
						|
	int i;
 | 
						|
 | 
						|
	argc = parse_options(argc, argv, prefix, options, usage, 0);
 | 
						|
 | 
						|
	printf("boolean: %d\n", boolean);
 | 
						|
	printf("integer: %u\n", integer);
 | 
						|
	printf("timestamp: %lu\n", timestamp);
 | 
						|
	printf("string: %s\n", string ? string : "(not set)");
 | 
						|
	printf("abbrev: %d\n", abbrev);
 | 
						|
	printf("verbose: %d\n", verbose);
 | 
						|
	printf("quiet: %s\n", quiet ? "yes" : "no");
 | 
						|
	printf("dry run: %s\n", dry_run ? "yes" : "no");
 | 
						|
	printf("file: %s\n", file ? file : "(not set)");
 | 
						|
 | 
						|
	for (i = 0; i < argc; i++)
 | 
						|
		printf("arg %02d: %s\n", i, argv[i]);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 |