 4156b6a741
			
		
	
	4156b6a741
	
	
	
		
			
			Start working to make the codebase buildable with -Wsign-compare. * ps/build-sign-compare: t/helper: don't depend on implicit wraparound scalar: address -Wsign-compare warnings builtin/patch-id: fix type of `get_one_patchid()` builtin/blame: fix type of `length` variable when emitting object ID gpg-interface: address -Wsign-comparison warnings daemon: fix type of `max_connections` daemon: fix loops that have mismatching integer types global: trivial conversions to fix `-Wsign-compare` warnings pkt-line: fix -Wsign-compare warning on 32 bit platform csum-file: fix -Wsign-compare warning on 32-bit platform diff.h: fix index used to loop through unsigned integer config.mak.dev: drop `-Wno-sign-compare` global: mark code units that generate warnings with `-Wsign-compare` compat/win32: fix -Wsign-compare warning in "wWinMain()" compat/regex: explicitly ignore "-Wsign-compare" warnings git-compat-util: introduce macros to disable "-Wsign-compare" warnings
		
			
				
	
	
		
			150 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			150 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "git-compat-util.h"
 | |
| #include "strvec.h"
 | |
| #include "strbuf.h"
 | |
| 
 | |
| const char *empty_strvec[] = { NULL };
 | |
| 
 | |
| void strvec_init(struct strvec *array)
 | |
| {
 | |
| 	struct strvec blank = STRVEC_INIT;
 | |
| 	memcpy(array, &blank, sizeof(*array));
 | |
| }
 | |
| 
 | |
| void strvec_push_nodup(struct strvec *array, char *value)
 | |
| {
 | |
| 	if (array->v == empty_strvec)
 | |
| 		array->v = NULL;
 | |
| 
 | |
| 	ALLOC_GROW(array->v, array->nr + 2, array->alloc);
 | |
| 	array->v[array->nr++] = value;
 | |
| 	array->v[array->nr] = NULL;
 | |
| }
 | |
| 
 | |
| const char *strvec_push(struct strvec *array, const char *value)
 | |
| {
 | |
| 	strvec_push_nodup(array, xstrdup(value));
 | |
| 	return array->v[array->nr - 1];
 | |
| }
 | |
| 
 | |
| const char *strvec_pushf(struct strvec *array, const char *fmt, ...)
 | |
| {
 | |
| 	va_list ap;
 | |
| 	struct strbuf v = STRBUF_INIT;
 | |
| 
 | |
| 	va_start(ap, fmt);
 | |
| 	strbuf_vaddf(&v, fmt, ap);
 | |
| 	va_end(ap);
 | |
| 
 | |
| 	strvec_push_nodup(array, strbuf_detach(&v, NULL));
 | |
| 	return array->v[array->nr - 1];
 | |
| }
 | |
| 
 | |
| void strvec_pushl(struct strvec *array, ...)
 | |
| {
 | |
| 	va_list ap;
 | |
| 	const char *arg;
 | |
| 
 | |
| 	va_start(ap, array);
 | |
| 	while ((arg = va_arg(ap, const char *)))
 | |
| 		strvec_push(array, arg);
 | |
| 	va_end(ap);
 | |
| }
 | |
| 
 | |
| void strvec_pushv(struct strvec *array, const char **items)
 | |
| {
 | |
| 	for (; *items; items++)
 | |
| 		strvec_push(array, *items);
 | |
| }
 | |
| 
 | |
| void strvec_splice(struct strvec *array, size_t idx, size_t len,
 | |
| 		   const char **replacement, size_t replacement_len)
 | |
| {
 | |
| 	if (idx + len > array->nr)
 | |
| 		BUG("range outside of array boundary");
 | |
| 	if (replacement_len > len) {
 | |
| 		if (array->v == empty_strvec)
 | |
| 			array->v = NULL;
 | |
| 		ALLOC_GROW(array->v, array->nr + (replacement_len - len) + 1,
 | |
| 			   array->alloc);
 | |
| 		array->v[array->nr + (replacement_len - len)] = NULL;
 | |
| 	}
 | |
| 	for (size_t i = 0; i < len; i++)
 | |
| 		free((char *)array->v[idx + i]);
 | |
| 	if ((replacement_len != len) && array->nr)
 | |
| 		memmove(array->v + idx + replacement_len, array->v + idx + len,
 | |
| 			(array->nr - idx - len + 1) * sizeof(char *));
 | |
| 	array->nr += replacement_len - len;
 | |
| 	for (size_t i = 0; i < replacement_len; i++)
 | |
| 		array->v[idx + i] = xstrdup(replacement[i]);
 | |
| }
 | |
| 
 | |
| const char *strvec_replace(struct strvec *array, size_t idx, const char *replacement)
 | |
| {
 | |
| 	char *to_free;
 | |
| 	if (idx >= array->nr)
 | |
| 		BUG("index outside of array boundary");
 | |
| 	to_free = (char *) array->v[idx];
 | |
| 	array->v[idx] = xstrdup(replacement);
 | |
| 	free(to_free);
 | |
| 	return array->v[idx];
 | |
| }
 | |
| 
 | |
| void strvec_remove(struct strvec *array, size_t idx)
 | |
| {
 | |
| 	if (idx >= array->nr)
 | |
| 		BUG("index outside of array boundary");
 | |
| 	free((char *)array->v[idx]);
 | |
| 	memmove(array->v + idx, array->v + idx + 1, (array->nr - idx) * sizeof(char *));
 | |
| 	array->nr--;
 | |
| }
 | |
| 
 | |
| void strvec_pop(struct strvec *array)
 | |
| {
 | |
| 	if (!array->nr)
 | |
| 		return;
 | |
| 	free((char *)array->v[array->nr - 1]);
 | |
| 	array->v[array->nr - 1] = NULL;
 | |
| 	array->nr--;
 | |
| }
 | |
| 
 | |
| void strvec_split(struct strvec *array, const char *to_split)
 | |
| {
 | |
| 	while (isspace(*to_split))
 | |
| 		to_split++;
 | |
| 	for (;;) {
 | |
| 		const char *p = to_split;
 | |
| 
 | |
| 		if (!*p)
 | |
| 			break;
 | |
| 
 | |
| 		while (*p && !isspace(*p))
 | |
| 			p++;
 | |
| 		strvec_push_nodup(array, xstrndup(to_split, p - to_split));
 | |
| 
 | |
| 		while (isspace(*p))
 | |
| 			p++;
 | |
| 		to_split = p;
 | |
| 	}
 | |
| }
 | |
| 
 | |
| void strvec_clear(struct strvec *array)
 | |
| {
 | |
| 	if (array->v != empty_strvec) {
 | |
| 		for (size_t i = 0; i < array->nr; i++)
 | |
| 			free((char *)array->v[i]);
 | |
| 		free(array->v);
 | |
| 	}
 | |
| 	strvec_init(array);
 | |
| }
 | |
| 
 | |
| const char **strvec_detach(struct strvec *array)
 | |
| {
 | |
| 	if (array->v == empty_strvec)
 | |
| 		return xcalloc(1, sizeof(const char *));
 | |
| 	else {
 | |
| 		const char **ret = array->v;
 | |
| 		strvec_init(array);
 | |
| 		return ret;
 | |
| 	}
 | |
| }
 |