From 7d62c70c59f7e948f6e2d433380b16189da84ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 17 Feb 2017 08:50:58 +0100 Subject: [PATCH] Initialise variables to default values --- src/openrct2/network/twitch.cpp | 6 +++--- src/openrct2/ride/ride.c | 6 +++--- src/openrct2/windows/server_list.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openrct2/network/twitch.cpp b/src/openrct2/network/twitch.cpp index 869b8968df..3ddf3e5a4a 100644 --- a/src/openrct2/network/twitch.cpp +++ b/src/openrct2/network/twitch.cpp @@ -199,7 +199,7 @@ namespace Twitch _twitchState = TWITCH_STATE_JOINING; _twitchIdle = false; - http_request_t request; + http_request_t request = { 0 }; request.url = url; request.method = HTTP_METHOD_GET; request.body = nullptr; @@ -276,7 +276,7 @@ namespace Twitch _twitchState = TWITCH_STATE_WAITING; _twitchIdle = false; - http_request_t request; + http_request_t request = { 0 }; request.url = url; request.method = HTTP_METHOD_GET; request.body = NULL; @@ -307,7 +307,7 @@ namespace Twitch _twitchState = TWITCH_STATE_WAITING; _twitchIdle = false; - http_request_t request; + http_request_t request = { 0 }; request.url = url; request.method = HTTP_METHOD_GET; request.body = nullptr; diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index cc62c01396..4bf2218982 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -765,7 +765,7 @@ sint32 ride_find_track_gap(rct_xy_element *input, rct_xy_element *output) { rct_window *w; rct_ride *ride; - track_circuit_iterator it, slowIt; + track_circuit_iterator it = { 0 }, slowIt; sint32 rideIndex; assert(map_element_get_type(input->element) == MAP_ELEMENT_TYPE_TRACK); @@ -5194,7 +5194,7 @@ static sint32 ride_is_valid_for_test(sint32 rideIndex, sint32 goingToBeOpen, sin { sint32 stationIndex; rct_ride *ride; - rct_xy_element trackElement, problematicTrackElement; + rct_xy_element trackElement, problematicTrackElement = { 0 }; ride = get_ride(rideIndex); if (ride->type == RIDE_TYPE_NULL) @@ -5323,7 +5323,7 @@ static sint32 ride_is_valid_for_open(sint32 rideIndex, sint32 goingToBeOpen, sin { sint32 stationIndex; rct_ride *ride; - rct_xy_element trackElement, problematicTrackElement; + rct_xy_element trackElement, problematicTrackElement = { 0 }; ride = get_ride(rideIndex); diff --git a/src/openrct2/windows/server_list.c b/src/openrct2/windows/server_list.c index 2f6d6c3dc0..63e505797b 100644 --- a/src/openrct2/windows/server_list.c +++ b/src/openrct2/windows/server_list.c @@ -702,7 +702,7 @@ static void fetch_servers() sort_servers(); SDL_UnlockMutex(_mutex); - http_request_t request; + http_request_t request = { 0 }; request.url = masterServerUrl; request.method = HTTP_METHOD_GET; request.body = NULL;