mirror of
https://git.proxmox.com/git/libgit2
synced 2025-12-30 21:34:00 +00:00
Fix some "signed v unsigned comparison" warnings with -Wextra
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
This commit is contained in:
parent
a4f863af4d
commit
0ef9d2aa93
@ -40,7 +40,7 @@ static struct {
|
||||
|
||||
const char *git_strerror(int num)
|
||||
{
|
||||
int i;
|
||||
size_t i;
|
||||
|
||||
if (num == GIT_EOSERR)
|
||||
return strerror(errno);
|
||||
|
||||
12
src/odb.c
12
src/odb.c
@ -124,14 +124,14 @@ GIT_INLINE(uint64_t) decode64(void *b)
|
||||
|
||||
const char *git_obj_type_to_string(git_otype type)
|
||||
{
|
||||
if (type < 0 || type >= ARRAY_SIZE(obj_type_table))
|
||||
if (type < 0 || ((size_t) type) >= ARRAY_SIZE(obj_type_table))
|
||||
return "";
|
||||
return obj_type_table[type].str;
|
||||
}
|
||||
|
||||
git_otype git_obj_string_to_type(const char *str)
|
||||
{
|
||||
int i;
|
||||
size_t i;
|
||||
|
||||
if (!str || !*str)
|
||||
return GIT_OBJ_BAD;
|
||||
@ -145,7 +145,7 @@ git_otype git_obj_string_to_type(const char *str)
|
||||
|
||||
int git_obj__loose_object_type(git_otype type)
|
||||
{
|
||||
if (type < 0 || type >= ARRAY_SIZE(obj_type_table))
|
||||
if (type < 0 || ((size_t) type) >= ARRAY_SIZE(obj_type_table))
|
||||
return 0;
|
||||
return obj_type_table[type].loose;
|
||||
}
|
||||
@ -155,10 +155,10 @@ static int format_object_header(char *hdr, size_t n, git_obj *obj)
|
||||
const char *type_str = git_obj_type_to_string(obj->type);
|
||||
int len = snprintf(hdr, n, "%s %"PRIuZ, type_str, obj->len);
|
||||
|
||||
assert(len > 0); /* otherwise snprintf() is broken */
|
||||
assert(len < n); /* otherwise the caller is broken! */
|
||||
assert(len > 0); /* otherwise snprintf() is broken */
|
||||
assert(((size_t) len) < n); /* otherwise the caller is broken! */
|
||||
|
||||
if (len < 0 || len >= n)
|
||||
if (len < 0 || ((size_t) len) >= n)
|
||||
return GIT_ERROR;
|
||||
return len+1;
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ static char to_hex[] = "0123456789abcdef";
|
||||
|
||||
int git_oid_mkstr(git_oid *out, const char *str)
|
||||
{
|
||||
int p;
|
||||
size_t p;
|
||||
for (p = 0; p < sizeof(out->id); p++, str += 2) {
|
||||
int v = (from_hex[(unsigned char)str[0]] << 4)
|
||||
| from_hex[(unsigned char)str[1]];
|
||||
@ -69,7 +69,7 @@ GIT_INLINE(char) *fmt_one(char *str, unsigned int val)
|
||||
|
||||
void git_oid_fmt(char *str, const git_oid *oid)
|
||||
{
|
||||
int i;
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < sizeof(oid->id); i++)
|
||||
str = fmt_one(str, oid->id[i]);
|
||||
@ -77,7 +77,7 @@ void git_oid_fmt(char *str, const git_oid *oid)
|
||||
|
||||
void git_oid_pathfmt(char *str, const git_oid *oid)
|
||||
{
|
||||
int i;
|
||||
size_t i;
|
||||
|
||||
str = fmt_one(str, oid->id[0]);
|
||||
*str++ = '/';
|
||||
|
||||
@ -35,7 +35,7 @@ int git__fmt(char *buf, size_t buf_sz, const char *fmt, ...)
|
||||
va_start(va, fmt);
|
||||
r = vsnprintf(buf, buf_sz, fmt, va);
|
||||
va_end(va);
|
||||
if (r < 0 || r >= buf_sz)
|
||||
if (r < 0 || ((size_t) r) >= buf_sz)
|
||||
return GIT_ERROR;
|
||||
return r;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user