string-list: fix sign compare warnings for loop iterator
There are a couple of "-Wsign-compare" warnings in "string-list.c". Fix trivial ones that result from a mismatched loop iterator type. There is a single warning left after these fixes. This warning needs a bit more care and is thus handled in subsequent commits. Signed-off-by: shejialuo <shejialuo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
shejialuo committed
Jun 29, 2025 at 12:27 UTC
ba472ab2f1b1af8ccb9768859fa56e2d136a759e
1 file changed
+10
-12
string-list.c
+10
-12
@@ -116,9 +116,9 @@ struct string_list_item *string_list_lookup(struct string_list *list, const char
116
void string_list_remove_duplicates(struct string_list *list, int free_util)
117
{
118
if (list->nr > 1) {
119
- int src, dst;
119
+ size_t dst = 1;
120
compare_strings_fn cmp = list->cmp ? list->cmp : strcmp;
121
- for (src = dst = 1; src < list->nr; src++) {
121
+ for (size_t src = 1; src < list->nr; src++) {
122
if (!cmp(list->items[dst - 1].string, list->items[src].string)) {
123
if (list->strdup_strings)
124
free(list->items[src].string);
@@ -134,8 +134,8 @@ void string_list_remove_duplicates(struct string_list *list, int free_util)
134
int for_each_string_list(struct string_list *list,
135
string_list_each_func_t fn, void *cb_data)
136
{
137
- int i, ret = 0;
138
- for (i = 0; i < list->nr; i++)
137
+ int ret = 0;
138
+ for (size_t i = 0; i < list->nr; i++)
139
if ((ret = fn(&list->items[i], cb_data)))
140
break;
141
return ret;
@@ -144,8 +144,8 @@ int for_each_string_list(struct string_list *list,
144
void filter_string_list(struct string_list *list, int free_util,
145
string_list_each_func_t want, void *cb_data)
146
{
147
- int src, dst = 0;
148
- for (src = 0; src < list->nr; src++) {
147
+ size_t dst = 0;
148
+ for (size_t src = 0; src < list->nr; src++) {
149
if (want(&list->items[src], cb_data)) {
150
list->items[dst++] = list->items[src];
151
} else {
@@ -171,13 +171,12 @@ void string_list_remove_empty_items(struct string_list *list, int free_util)
171
void string_list_clear(struct string_list *list, int free_util)
172
{
173
if (list->items) {
174
- int i;
174
if (list->strdup_strings) {
176
- for (i = 0; i < list->nr; i++)
175
+ for (size_t i = 0; i < list->nr; i++)
176
free(list->items[i].string);
177
}
178
if (free_util) {
180
- for (i = 0; i < list->nr; i++)
179
+ for (size_t i = 0; i < list->nr; i++)
180
free(list->items[i].util);
181
}
182
free(list->items);
@@ -189,13 +188,12 @@ void string_list_clear(struct string_list *list, int free_util)
188
void string_list_clear_func(struct string_list *list, string_list_clear_func_t clearfunc)
189
{
190
if (list->items) {
192
- int i;
191
if (clearfunc) {
194
- for (i = 0; i < list->nr; i++)
192
+ for (size_t i = 0; i < list->nr; i++)
193
clearfunc(list->items[i].util, list->items[i].string);
194
}
195
if (list->strdup_strings) {
198
- for (i = 0; i < list->nr; i++)
196
+ for (size_t i = 0; i < list->nr; i++)
197
free(list->items[i].string);
198
}
199
free(list->items);