OISF/suricata
1
0
Fork 0
mirror of https://github.com/OISF/suricata.git synced 2026-10-11 22:09:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows: use _tzname instead of tzname

Browse Source 
tzname is a POSIX variable, WIN32 has prefixed many POSIX variables
with "_". While Mingw64 supports both, UCRT64 emits a compiler warning
on the usage of "tzname".

This triggered a rather large clang-format update.
This commit is contained in:
Jason Ish
2025-06-17 15:37:45 +02:00
committed by Victor Julien
parent 106e09ed57
commit 17ed6f7b8e
2 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/builds.yml
+1
View File
@@ -2985,6 +2985,7 @@ jobs:
make
mingw-w64-ucrt-x86_64-cbindgen
mingw-w64-ucrt-x86_64-jansson
mingw-w64-ucrt-x86_64-jq
mingw-w64-ucrt-x86_64-libpcap
mingw-w64-ucrt-x86_64-libtool
mingw-w64-ucrt-x86_64-libyaml
src/util-strptime.c
+75 -71
View File
@@ -383,54 +383,58 @@ recurse:
#endif
bp += 3;
} else {
ep = find_string(bp, &i,
(const char * const *)tzname,
NULL, 2);
if (ep != NULL) {
tm->tm_isdst = i;
ep = find_string(bp, &i,
#ifdef _WIN32
(const char *const *)_tzname,
#else
(const char *const *)tzname,
#endif
NULL, 2);
if (ep != NULL) {
tm->tm_isdst = i;
#ifdef TM_GMTOFF
tm->TM_GMTOFF = -(timezone);
#endif
#ifdef TM_ZONE
tm->TM_ZONE = tzname[i];
#endif
}
bp = ep;
}
continue;
}
bp = ep;
}
continue;
case 'z':
/*
* We recognize all ISO 8601 formats:
* Z = Zulu time/UTC
* [+-]hhmm
* [+-]hh:mm
* [+-]hh
* We recognize all RFC-822/RFC-2822 formats:
* UT|GMT
* North American : UTC offsets
* E[DS]T = Eastern : -4 | -5
* C[DS]T = Central : -5 | -6
* M[DS]T = Mountain: -6 | -7
* P[DS]T = Pacific : -7 | -8
* Military
* [A-IL-M] = -1 ... -9 (J not used)
* [N-Y] = +1 ... +12
*/
while (isspace(*bp))
bp++;
case 'z':
/*
* We recognize all ISO 8601 formats:
* Z = Zulu time/UTC
* [+-]hhmm
* [+-]hh:mm
* [+-]hh
* We recognize all RFC-822/RFC-2822 formats:
* UT|GMT
* North American : UTC offsets
* E[DS]T = Eastern : -4 | -5
* C[DS]T = Central : -5 | -6
* M[DS]T = Mountain: -6 | -7
* P[DS]T = Pacific : -7 | -8
* Military
* [A-IL-M] = -1 ... -9 (J not used)
* [N-Y] = +1 ... +12
*/
while (isspace(*bp))
bp++;
switch (*bp++) {
case 'G':
if (*bp++ != 'M')
return NULL;
/*FALLTHROUGH*/
case 'U':
if (*bp++ != 'T')
return NULL;
/*FALLTHROUGH*/
case 'Z':
tm->tm_isdst = 0;
switch (*bp++) {
case 'G':
if (*bp++ != 'M')
return NULL;
/*FALLTHROUGH*/
case 'U':
if (*bp++ != 'T')
return NULL;
/*FALLTHROUGH*/
case 'Z':
tm->tm_isdst = 0;
#ifdef TM_GMTOFF
tm->TM_GMTOFF = 0;
#endif
@@ -489,37 +493,37 @@ recurse:
continue;
}
return NULL;
}
offs = 0;
for (i = 0; i < 4; ) {
if (isdigit(*bp)) {
offs = offs * 10 + (*bp++ - '0');
i++;
continue;
}
if (i == 2 && *bp == ':') {
bp++;
continue;
}
break;
}
switch (i) {
case 2:
offs *= 100;
break;
case 4:
i = offs % 100;
if (i >= 60)
return NULL;
/* Convert minutes into decimal */
offs = (offs / 100) * 100 + (i * 50) / 30;
break;
default:
return NULL;
}
if (neg)
offs = -offs;
tm->tm_isdst = 0; /* XXX */
}
offs = 0;
for (i = 0; i < 4;) {
if (isdigit(*bp)) {
offs = offs * 10 + (*bp++ - '0');
i++;
continue;
}
if (i == 2 && *bp == ':') {
bp++;
continue;
}
break;
}
switch (i) {
case 2:
offs *= 100;
break;
case 4:
i = offs % 100;
if (i >= 60)
return NULL;
/* Convert minutes into decimal */
offs = (offs / 100) * 100 + (i * 50) / 30;
break;
default:
return NULL;
}
if (neg)
offs = -offs;
tm->tm_isdst = 0; /* XXX */
#ifdef TM_GMTOFF
tm->TM_GMTOFF = offs;
#endif