kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

connect: address -Wsign-compare warnings 

Most of the warnings were about loop variables being declared as ints
with a condition using a size_t, whereby switching the variable to
size_t fixes the warning.

One other case was comparing the result of strlen to an int passed
as an argument, which turns out could just as well be passed as a
size_t, albeit trickling to other functions.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Mike Hommey 2025-01-17 16:49:09 +09:00 committed by Junio C Hamano
parent fbe8d3079d
commit 49b299215d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
connect.c
View File

@ -1,5 +1,4 @@
#define USE_THE_REPOSITORY_VARIABLE #define USE_THE_REPOSITORY_VARIABLE
#define DISABLE_SIGN_COMPARE_WARNINGS


#include "git-compat-util.h" #include "git-compat-util.h"
#include "config.h" #include "config.h"
@ -77,7 +76,7 @@ static NORETURN void die_initial_contact(int unexpected)
/* Checks if the server supports the capability 'c' */ /* Checks if the server supports the capability 'c' */
int server_supports_v2(const char *c) int server_supports_v2(const char *c)
{ {
int i; size_t i;


for (i = 0; i < server_capabilities_v2.nr; i++) { for (i = 0; i < server_capabilities_v2.nr; i++) {
const char *out; const char *out;
@ -96,7 +95,7 @@ void ensure_server_supports_v2(const char *c)


int server_feature_v2(const char *c, const char **v) int server_feature_v2(const char *c, const char **v)
{ {
int i; size_t i;


for (i = 0; i < server_capabilities_v2.nr; i++) { for (i = 0; i < server_capabilities_v2.nr; i++) {
const char *out; const char *out;
@ -112,7 +111,7 @@ int server_feature_v2(const char *c, const char **v)
int server_supports_feature(const char *c, const char *feature, int server_supports_feature(const char *c, const char *feature,
int die_on_error) int die_on_error)
{ {
int i; size_t i;


for (i = 0; i < server_capabilities_v2.nr; i++) { for (i = 0; i < server_capabilities_v2.nr; i++) {
const char *out; const char *out;
@ -232,12 +231,12 @@ static void annotate_refs_with_symref_info(struct ref *ref)
string_list_clear(&symref, 0); string_list_clear(&symref, 0);
} }


static void process_capabilities(struct packet_reader *reader, int *linelen) static void process_capabilities(struct packet_reader *reader, size_t *linelen)
{ {
const char *feat_val; const char *feat_val;
size_t feat_len; size_t feat_len;
const char *line = reader->line; const char *line = reader->line;
int nul_location = strlen(line); size_t nul_location = strlen(line);
if (nul_location == *linelen) if (nul_location == *linelen)
return; return;
server_capabilities_v1 = xstrdup(line + nul_location + 1); server_capabilities_v1 = xstrdup(line + nul_location + 1);
@ -271,14 +270,14 @@ static int process_dummy_ref(const struct packet_reader *reader)
!strcmp(name, "capabilities^{}"); !strcmp(name, "capabilities^{}");
} }


static void check_no_capabilities(const char *line, int len) static void check_no_capabilities(const char *line, size_t len)
{ {
if (strlen(line) != len) if (strlen(line) != len)
warning(_("ignoring capabilities after first line '%s'"), warning(_("ignoring capabilities after first line '%s'"),
line + strlen(line)); line + strlen(line));
} }


static int process_ref(const struct packet_reader *reader, int len, static int process_ref(const struct packet_reader *reader, size_t len,
struct ref ***list, unsigned int flags, struct ref ***list, unsigned int flags,
struct oid_array *extra_have) struct oid_array *extra_have)
{ {
@ -306,7 +305,7 @@ static int process_ref(const struct packet_reader *reader, int len,
return 1; return 1;
} }


static int process_shallow(const struct packet_reader *reader, int len, static int process_shallow(const struct packet_reader *reader, size_t len,
struct oid_array *shallow_points) struct oid_array *shallow_points)
{ {
const char *line = reader->line; const char *line = reader->line;
@ -341,7 +340,7 @@ struct ref **get_remote_heads(struct packet_reader *reader,
struct oid_array *shallow_points) struct oid_array *shallow_points)
{ {
struct ref **orig_list = list; struct ref **orig_list = list;
int len = 0; size_t len = 0;
enum get_remote_heads_state state = EXPECTING_FIRST_REF; enum get_remote_heads_state state = EXPECTING_FIRST_REF;


*list = NULL; *list = NULL;
@ -394,7 +393,7 @@ static int process_ref_v2(struct packet_reader *reader, struct ref ***list,
const char **unborn_head_target) const char **unborn_head_target)
{ {
int ret = 1; int ret = 1;
int i = 0; size_t i = 0;
struct object_id old_oid; struct object_id old_oid;
struct ref *ref; struct ref *ref;
struct string_list line_sections = STRING_LIST_INIT_DUP; struct string_list line_sections = STRING_LIST_INIT_DUP;
@ -552,7 +551,7 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
const struct string_list *server_options, const struct string_list *server_options,
int stateless_rpc) int stateless_rpc)
{ {
int i; size_t i;
struct strvec *ref_prefixes = transport_options ? struct strvec *ref_prefixes = transport_options ?
&transport_options->ref_prefixes : NULL; &transport_options->ref_prefixes : NULL;
const char **unborn_head_target = transport_options ? const char **unborn_head_target = transport_options ?