mirror of
https://git.proxmox.com/git/libgit2
synced 2025-08-13 23:05:27 +00:00
Fix false positive -Wuninitialized warnings
GCC produces several -Wuninitialized warnings. Most of them can be fixed if we make visible for gcc that git__throw() and git__rethrow() always return first argument. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
This commit is contained in:
parent
a7e34e3c85
commit
d7f0ababe1
@ -46,8 +46,13 @@ typedef SSIZE_T ssize_t;
|
|||||||
#include "thread-utils.h"
|
#include "thread-utils.h"
|
||||||
#include "bswap.h"
|
#include "bswap.h"
|
||||||
|
|
||||||
extern int git__throw(int error, const char *, ...) GIT_FORMAT_PRINTF(2, 3);
|
extern void git___throw(const char *, ...) GIT_FORMAT_PRINTF(1, 2);
|
||||||
extern int git__rethrow(int error, const char *, ...) GIT_FORMAT_PRINTF(2, 3);
|
#define git__throw(error, ...) \
|
||||||
|
(git___throw(__VA_ARGS__), error)
|
||||||
|
|
||||||
|
extern void git___rethrow(const char *, ...) GIT_FORMAT_PRINTF(1, 2);
|
||||||
|
#define git__rethrow(error, ...) \
|
||||||
|
(git___rethrow(__VA_ARGS__), error)
|
||||||
|
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ const char *git_strerror(int num)
|
|||||||
return "Unknown error";
|
return "Unknown error";
|
||||||
}
|
}
|
||||||
|
|
||||||
int git__rethrow(int error, const char *msg, ...)
|
void git___rethrow(const char *msg, ...)
|
||||||
{
|
{
|
||||||
char new_error[1024];
|
char new_error[1024];
|
||||||
char *old_error = NULL;
|
char *old_error = NULL;
|
||||||
@ -91,19 +91,15 @@ int git__rethrow(int error, const char *msg, ...)
|
|||||||
old_error = strdup(g_last_error);
|
old_error = strdup(g_last_error);
|
||||||
snprintf(g_last_error, sizeof(g_last_error), "%s \n - %s", new_error, old_error);
|
snprintf(g_last_error, sizeof(g_last_error), "%s \n - %s", new_error, old_error);
|
||||||
free(old_error);
|
free(old_error);
|
||||||
|
|
||||||
return error;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int git__throw(int error, const char *msg, ...)
|
void git___throw(const char *msg, ...)
|
||||||
{
|
{
|
||||||
va_list va;
|
va_list va;
|
||||||
|
|
||||||
va_start(va, msg);
|
va_start(va, msg);
|
||||||
vsnprintf(g_last_error, sizeof(g_last_error), msg, va);
|
vsnprintf(g_last_error, sizeof(g_last_error), msg, va);
|
||||||
va_end(va);
|
va_end(va);
|
||||||
|
|
||||||
return error;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *git_lasterror(void)
|
const char *git_lasterror(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user