From 082f9d3019f3816fb6fb6341539dc5ca7e631cd7 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Mon, 21 Sep 2015 23:38:00 -0400 Subject: [PATCH] handle various warnings/issues (msvc:rel) --- src/localization/localize.cpp | 1 + src/menuui/credits.cpp | 1 + src/mission/missioncampaign.cpp | 1 + src/mission/missionparse.cpp | 3 ++- src/network/gtrack.cpp | 2 ++ src/network/multimsgs.cpp | 6 ++++-- src/network/ptrack.cpp | 2 ++ src/network/valid.cpp | 2 ++ src/object/collideshipweapon.cpp | 3 ++- src/platform/platform.cpp | 2 -- src/ship/aicode.cpp | 3 ++- 11 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/localization/localize.cpp b/src/localization/localize.cpp index eb1f6b4..d414fb9 100644 --- a/src/localization/localize.cpp +++ b/src/localization/localize.cpp @@ -652,6 +652,7 @@ void lcl_xstr_init() num_offsets_on_this_line = 0; } } catch (parse_error_t rval) { + (void)rval; // suppress unused warning in release build mprintf(("Error parsing 'strings.tbl'\nError code = %i.\n", (int)rval)); } #else diff --git a/src/menuui/credits.cpp b/src/menuui/credits.cpp index 5c3da3a..4c17ab8 100644 --- a/src/menuui/credits.cpp +++ b/src/menuui/credits.cpp @@ -452,6 +452,7 @@ void credits_init() } while (linep2 != NULL); } } catch (parse_error_t rval) { + (void)rval; // suppress unused warning in release build mprintf(("Error parsing 'credits.tbl'\nError code = %i.\n", (int)rval)); } diff --git a/src/mission/missioncampaign.cpp b/src/mission/missioncampaign.cpp index e314bc1..dc410ba 100644 --- a/src/mission/missioncampaign.cpp +++ b/src/mission/missioncampaign.cpp @@ -605,6 +605,7 @@ int mission_campaign_load( const char *filename, int load_savefile ) Campaign.num_missions++; } } catch (parse_error_t rval) { + (void)rval; // suppress unused warning in release build mprintf(("Error parsing '%s'\r\nError code = %i.\r\n", filename, (int)rval)); // close localization diff --git a/src/mission/missionparse.cpp b/src/mission/missionparse.cpp index b542e09..f805d96 100644 --- a/src/mission/missionparse.cpp +++ b/src/mission/missionparse.cpp @@ -673,8 +673,9 @@ void parse_mission_info(mission *pm) required_string("$Version:"); stuff_float(&pm->version); - if (pm->version != MISSION_VERSION) + if (pm->version != MISSION_VERSION) { mprintf(("Older mission, should update it (%.2f<-->%.2f)", pm->version, MISSION_VERSION)); + } required_string("$Name:"); stuff_string(pm->name, F_NAME, NULL); diff --git a/src/network/gtrack.cpp b/src/network/gtrack.cpp index 3898d70..3b59fe2 100644 --- a/src/network/gtrack.cpp +++ b/src/network/gtrack.cpp @@ -409,6 +409,8 @@ void IdleGameTracker() struct sockaddr_in fromaddr; game_packet_header inpacket; + + SDL_zero(inpacket); addrsize = sizeof(struct sockaddr_in); bytesin = RECVFROM(Unreliable_socket, (char *)&packet_data, sizeof(game_packet_header), 0, (struct sockaddr *)&fromaddr, &addrsize, PSNET_TYPE_GAME_TRACKER); diff --git a/src/network/multimsgs.cpp b/src/network/multimsgs.cpp index 5bf2a37..c954937 100644 --- a/src/network/multimsgs.cpp +++ b/src/network/multimsgs.cpp @@ -4952,8 +4952,9 @@ void process_ai_info_update_packet( ubyte *data, header *hinfo) GET_USHORT( net_signature ); // signature of the object that we are dealing with. GET_DATA( code ); // code of what we are doing. objp = multi_get_network_object( net_signature ); - if ( !objp ) + if ( !objp ) { nprintf(("Network", "Couldn't find object for ai update\n")); + } switch( code ) { case AI_UPDATE_DOCK: @@ -4961,8 +4962,9 @@ void process_ai_info_update_packet( ubyte *data, header *hinfo) GET_DATA( dock_index ); GET_DATA( dockee_index ); other_objp = multi_get_network_object( other_net_signature ); - if ( !other_objp ) + if ( !other_objp ) { nprintf(("Network", "Couldn't find other object for ai update on dock\n")); + } // if we don't have an object to work with, break out of loop if ( !objp || !other_objp || (objp->type != OBJ_SHIP) || (other_objp->type != OBJ_SHIP)){ diff --git a/src/network/ptrack.cpp b/src/network/ptrack.cpp index b8cadce..32db999 100644 --- a/src/network/ptrack.cpp +++ b/src/network/ptrack.cpp @@ -701,6 +701,8 @@ void PollPTrackNet() struct sockaddr_in fromaddr; udp_packet_header inpacket; + + SDL_zero(inpacket); addrsize = sizeof(struct sockaddr_in); bytesin = RECVFROM(Unreliable_socket, (char *)&packet_data, sizeof(udp_packet_header), 0, (struct sockaddr *)&fromaddr, &addrsize, PSNET_TYPE_USER_TRACKER); diff --git a/src/network/valid.cpp b/src/network/valid.cpp index 8a75e6f..128f11a 100644 --- a/src/network/valid.cpp +++ b/src/network/valid.cpp @@ -366,6 +366,8 @@ void ValidIdle() struct sockaddr_in fromaddr; udp_packet_header inpacket; + + SDL_zero(inpacket); addrsize = sizeof(struct sockaddr_in); bytesin = RECVFROM(Unreliable_socket, (char *)&packet_data, sizeof(udp_packet_header), 0, (struct sockaddr *)&fromaddr, &addrsize, PSNET_TYPE_VALIDATION); diff --git a/src/object/collideshipweapon.cpp b/src/object/collideshipweapon.cpp index 05c01c1..67f2d72 100644 --- a/src/object/collideshipweapon.cpp +++ b/src/object/collideshipweapon.cpp @@ -371,8 +371,9 @@ int ship_weapon_check_collision(object * ship_obj, object * weapon_obj, float ti // check if we're colliding against "invisible" ship if (!(Ship_info[shipp->ship_info_index].flags & SIF_DONT_COLLIDE_INVIS)) { wp->lifeleft = 0.001f; - if (ship_obj == Player_obj) + if (ship_obj == Player_obj) { nprintf(("Jim", "Frame %i: Weapon %i set to detonate, dist = %7.3f.\n", Framecount, weapon_obj-Objects, dist)); + } valid_hit_occured = 1; } } diff --git a/src/platform/platform.cpp b/src/platform/platform.cpp index 151c062..bc9cefc 100644 --- a/src/platform/platform.cpp +++ b/src/platform/platform.cpp @@ -98,8 +98,6 @@ void *vm_malloc(int size) Error(LOCATION, "Out of memory. Try closing down other applications, increasing your\n" "virtual memory size, or installing more physical RAM.\n"); - - return NULL; } #ifndef NDEBUG diff --git a/src/ship/aicode.cpp b/src/ship/aicode.cpp index c21831d..d2144aa 100644 --- a/src/ship/aicode.cpp +++ b/src/ship/aicode.cpp @@ -5531,8 +5531,9 @@ void set_primary_weapon_linkage(object *objp) shipp->flags &= ~SF_PRIMARY_LINKED; if (Num_weapons > (int) (MAX_WEAPONS * 0.75f)) { - if (shipp->flags & SF_PRIMARY_LINKED) + if (shipp->flags & SF_PRIMARY_LINKED) { nprintf(("AI", "Frame %i, ship %s: Unlinking primaries.\n", Framecount, shipp->ship_name)); + } shipp->flags &= ~SF_PRIMARY_LINKED; return; // If low on slots, don't link. } -- 2.39.2