Skip to content

Commit

Permalink
Merge branch 'sk/strlen-returns-size_t' into seen
Browse files Browse the repository at this point in the history
* sk/strlen-returns-size_t:
  date.c: Fix type missmatch warings from msvc
  • Loading branch information
gitster committed Dec 27, 2024
2 parents dda7e79 + d11d003 commit 6a9cf80
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions date.c
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm
}

for (s = special; s->name; s++) {
int len = strlen(s->name);
size_t len = strlen(s->name);
if (match_string(date, s->name) == len) {
s->fn(tm, now, num);
*touched = 1;
Expand All @@ -1254,7 +1254,7 @@ static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm

if (!*num) {
for (i = 1; i < 11; i++) {
int len = strlen(number_name[i]);
size_t len = strlen(number_name[i]);
if (match_string(date, number_name[i]) == len) {
*num = i;
*touched = 1;
Expand All @@ -1270,7 +1270,7 @@ static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm

tl = typelen;
while (tl->type) {
int len = strlen(tl->type);
size_t len = strlen(tl->type);
if (match_string(date, tl->type) >= len-1) {
update_tm(tm, now, tl->length * *num);
*num = 0;
Expand Down

0 comments on commit 6a9cf80

Please sign in to comment.