Skip to content

bpo-40714: Remove compile warning from _zoneinfo.c #20291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2020
Merged

bpo-40714: Remove compile warning from _zoneinfo.c #20291

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
014b51e
bpo-40714: Remove compile warning from _zoneinfo.c
corona10 May 21, 2020
e8309e6
bpo-40714: Apply Paul's review
corona10 May 21, 2020
40b2be9
Update Modules/_zoneinfo.c
corona10 May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Modules/_zoneinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,9 @@ parse_tz_str(PyObject *tz_str_obj, _tzrule *out)
PyObject *dst_abbr = NULL;
TransitionRuleType *start = NULL;
TransitionRuleType *end = NULL;
long std_offset, dst_offset;
// Initialize offsets to invalid value (> 24 hours)
long std_offset = 1 << 20;
long dst_offset = 1 << 20;

char *tz_str = PyBytes_AsString(tz_str_obj);
if (tz_str == NULL) {
Expand Down Expand Up @@ -1907,7 +1909,7 @@ build_tzrule(PyObject *std_abbr, PyObject *dst_abbr, long std_offset,
long dst_offset, TransitionRuleType *start,
TransitionRuleType *end, _tzrule *out)
{
_tzrule rv = {0};
_tzrule rv = {{0}};

rv.start = start;
rv.end = end;
Expand Down