Merge pull request #6948 from notimaginative/compile_warnings

notimaginative · web-flow · commit e1ae9385533c · 2025-08-18T16:36:08.000-04:00
address various build warnings
diff --git a/code/cfile/cfile.cpp b/code/cfile/cfile.cpp
@@ -902,7 +902,7 @@ static CFILE *cf_open_fill_cfblock(const char* source, int line, const char* ori
 		cfp->source_file = source;
 		cfp->line_num = line;
 		
-		int pos = ftell(fp);
+		auto pos = ftell(fp);
 		if(pos == -1L)
 			pos = 0;
 		cf_init_lowlevel_read_code(cfp,0,filelength(fileno(fp)), 0 );
diff --git a/code/cfile/cfilecompression.cpp b/code/cfile/cfilecompression.cpp
@@ -143,7 +143,7 @@ void lz41_load_offsets(CFILE* cf)
 	int* offsets_ptr = cf->compression_info.offsets;
 
 	/* Seek to the first offset position, remember to consider the trailing ints */
-	fso_fseek(cf, ( ( sizeof(int) * cf->compression_info.num_offsets ) * -1 ) - (sizeof(int)*3 ), SEEK_END);
+	fso_fseek(cf, static_cast<int>( ( sizeof(int) * cf->compression_info.num_offsets ) * -1 ) - (sizeof(int)*3 ), SEEK_END);
 	for (block = 0; block < cf->compression_info.num_offsets; ++block)
 	{
 		auto bytes_read = fread(offsets_ptr++, sizeof(int), 1, cf->fp);
diff --git a/code/cutscene/ffmpeg/internal.cpp b/code/cutscene/ffmpeg/internal.cpp
@@ -12,9 +12,10 @@ DecoderStatus::~DecoderStatus() {
 	videoCodec = nullptr;
 
 	if (videoCodecCtx != nullptr) {
-		avcodec_close(videoCodecCtx);
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
 		avcodec_free_context(&videoCodecCtx);
+#else
+		avcodec_close(videoCodecCtx);
 #endif
 		videoCodecCtx = nullptr;
 	}
@@ -24,9 +25,10 @@ DecoderStatus::~DecoderStatus() {
 	audioCodec = nullptr;
 
 	if (audioCodecCtx != nullptr) {
-		avcodec_close(audioCodecCtx);
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
 		avcodec_free_context(&audioCodecCtx);
+#else
+		avcodec_close(audioCodecCtx);
 #endif
 		audioCodecCtx = nullptr;
 	}
@@ -36,9 +38,10 @@ DecoderStatus::~DecoderStatus() {
 	subtitleCodec = nullptr;
 
 	if (subtitleCodecCtx != nullptr) {
-		avcodec_close(subtitleCodecCtx);
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
 		avcodec_free_context(&subtitleCodecCtx);
+#else
+		avcodec_close(subtitleCodecCtx);
 #endif
 		subtitleCodecCtx = nullptr;
 	}
diff --git a/code/debugconsole/consoleparse.cpp b/code/debugconsole/consoleparse.cpp
@@ -1083,7 +1083,7 @@ void dc_stuff_int(int *i)
 	value_l = dc_parse_long(token.c_str(), DCT_INT);
 
 	if ((value_l < INT_MAX) && (value_l > INT_MIN)) {
-		*i = value_l;
+		*i = static_cast<int>(value_l);
 
 	} else {
 		throw errParse(token.c_str(), DCT_INT);
@@ -1101,7 +1101,7 @@ void dc_stuff_uint(uint *i)
 	value_l = dc_parse_long(Cp, DCT_INT);
 
 	if (value_l < UINT_MAX) {
-		*i = value_l;
+		*i = static_cast<uint>(value_l);
 
 	} else {
 		throw errParse(token.c_str(), DCT_INT);
diff --git a/code/headtracking/freetrack.cpp b/code/headtracking/freetrack.cpp
@@ -1,4 +1,6 @@
 
+#ifdef _WIN32
+
 #include "headtracking/freetrack.h"
 
 #define WIN32_LEAN_AND_MEAN
@@ -183,3 +185,5 @@ namespace headtracking
 		}
 	}
 }
+
+#endif	// _WIN32
diff --git a/code/headtracking/freetrack.h b/code/headtracking/freetrack.h
@@ -2,6 +2,8 @@
 #ifndef HEADTRACKING_FREETRACK_H
 #define HEADTRACKING_FREETRACK_H
 
+#ifdef _WIN32
+
 #include "headtracking/headtracking.h"
 #include "headtracking/headtracking_internal.h"
 
@@ -92,4 +94,6 @@ namespace headtracking
 	}
 }
 
+#endif	// _WIN32
+
 #endif // HEADTRACKING_FREETRACK_H
diff --git a/code/headtracking/trackir.cpp b/code/headtracking/trackir.cpp
@@ -1,4 +1,6 @@
 
+#ifdef _WIN32
+
 #include "headtracking/trackir.h"
 
 #include "headtracking/trackirpublic.h"
@@ -53,3 +55,5 @@ namespace headtracking
 		}
 	}
 }
+
+#endif	// _WIN32
diff --git a/code/headtracking/trackir.h b/code/headtracking/trackir.h
@@ -2,6 +2,8 @@
 #ifndef HEADTRACKING_TRACKIR_H
 #define HEADTRACKING_TRACKIR_H
 
+#ifdef _WIN32
+
 #include "headtracking/headtracking.h"
 #include "headtracking/headtracking_internal.h"
 #include "headtracking/trackirpublic.h"
@@ -24,4 +26,6 @@ namespace headtracking
 	}
 }
 
+#endif	// _WIN32
+
 #endif // HEADTRACKING_TRACKIR_H
diff --git a/code/headtracking/trackirpublic.cpp b/code/headtracking/trackirpublic.cpp
@@ -1,4 +1,6 @@
 
+#ifdef _WIN32
+
 #include "headtracking/trackirpublic.h"
 
 TrackIRDLL::TrackIRDLL()
@@ -126,3 +128,5 @@ float TrackIRDLL::GetYaw() const
 		return m_GetYaw();
 	return 0.0f;
 }
+
+#endif	// _WIN32
diff --git a/code/headtracking/trackirpublic.h b/code/headtracking/trackirpublic.h
@@ -1,6 +1,8 @@
 #ifndef TRACKIRPUBLIC_H_INCLUDED_
 #define TRACKIRPUBLIC_H_INCLUDED_
 
+#ifdef _WIN32
+
 #include "external_dll/externalcode.h"
 #include "globalincs/pstypes.h"
 #include "osapi/osapi.h"
@@ -82,4 +84,6 @@ class TrackIRDLL : public SCP_ExternalCode
 	bool m_enabled;
 };
 
+#endif	// _WIN32
+
 #endif /* TRACKIRPUBLIC_H_INCLUDED_ */
diff --git a/code/inetfile/chttpget.cpp b/code/inetfile/chttpget.cpp
@@ -392,7 +392,7 @@ int ChttpGet::ConnectSocket()
 
 char *ChttpGet::GetHTTPLine()
 {
-	int iBytesRead;
+	long iBytesRead;
 	char chunk[2];
 	uint igotcrlf = 0;
 	memset(recv_buffer,0,1000);
@@ -463,7 +463,7 @@ char *ChttpGet::GetHTTPLine()
 uint ChttpGet::ReadDataChannel()
 {
 	char sDataBuffer[4096];		// Data-storage buffer for the data channel
-	int nBytesRecv = 0;						// Bytes received from the data channel
+	long nBytesRecv = 0;						// Bytes received from the data channel
 
 	fd_set	wfds;
 
diff --git a/code/math/ik_solver.cpp b/code/math/ik_solver.cpp
@@ -204,7 +204,7 @@ bool ik_constraint_window::constrain(matrix& localRot, bool /*backwardsPass*/) c
 	
 	//Clamp absolute value of individual angles to window
 	for (float angles::* i : pbh) {
-		const float absAngle = abs(currentAngles.*i);
+		const float absAngle = std::abs(currentAngles.*i);
 		if(absAngle > absLimit.*i){
 			needsClamp = true;
 			currentAngles.*i = copysignf(std::min(absAngle, absLimit.*i), currentAngles.*i);
diff --git a/code/missionui/missionweaponchoice.cpp b/code/missionui/missionweaponchoice.cpp
@@ -941,7 +941,7 @@ void draw_3d_overhead_view(int model_num,
 					gr_curve(lineendx, lineendy, 5, curve, resize_mode);
 
 					if (curve == 0 || curve == 1) {
-						lineendy = bank_coords[x][1] + lround(bank_y_offset * 1.5);
+						lineendy = bank_coords[x][1] + static_cast<int>(lround(bank_y_offset * 1.5));
 					} else {
 						lineendy = bank_coords[x][1] + (bank_y_offset / 2);
 					}
@@ -1015,7 +1015,7 @@ void draw_3d_overhead_view(int model_num,
 					if (curve == 1 || curve == 2) {
 						lineendy = bank_coords[x + MAX_SHIP_PRIMARY_BANKS][1] + (bank_y_offset / 2);
 					} else {
-						lineendy = bank_coords[x + MAX_SHIP_PRIMARY_BANKS][1] + lround(bank_y_offset * 1.5);
+						lineendy = bank_coords[x + MAX_SHIP_PRIMARY_BANKS][1] + static_cast<int>(lround(bank_y_offset * 1.5));
 					}
 
 					gr_line(xc, lineendy, xc, yc, resize_mode);
diff --git a/code/model/modelread.cpp b/code/model/modelread.cpp
@@ -1065,7 +1065,7 @@ float get_submodel_delta_angle(const submodel_instance *smi)
 float get_submodel_delta_shift(const submodel_instance *smi)
 {
 	// this is a bit simpler
-	return abs(smi->cur_offset - smi->prev_offset);
+	return std::abs(smi->cur_offset - smi->prev_offset);
 }
 
 void do_new_subsystem( int n_subsystems, model_subsystem *slist, int subobj_num, float rad, const vec3d *pnt, char *props, const char *subobj_name, int model_num )
@@ -4388,7 +4388,7 @@ void submodel_look_at(polymodel *pm, polymodel_instance *pmi, int submodel_num)
 
 	// calculate turn rate
 	// (try to avoid a one-frame dramatic spike in the turn rate if the angle passes 0.0 or PI2)
-	if (abs(smi->cur_angle - smi->prev_angle) < PI)
+	if (std::abs(smi->cur_angle - smi->prev_angle) < PI)
 		smi->current_turn_rate = smi->desired_turn_rate = (smi->cur_angle - smi->prev_angle) / flFrametime;
 
 	// and now set the other submodel fields
diff --git a/code/network/chat_api.cpp b/code/network/chat_api.cpp
@@ -473,7 +473,7 @@ char *ChatGetString(void)
 	struct timeval timeout; 
 	char ch[2];
 	char *p;
-	int bytesread;
+	long bytesread;
 	static char return_string[MAXCHATBUFFER];
 	
 	timeout.tv_sec=0;            
diff --git a/code/network/multiutil.cpp b/code/network/multiutil.cpp
@@ -3310,7 +3310,7 @@ void bitbuffer_put( bitbuffer *bitbuf, uint data, int bit_count )
 {
 	uint mask;
 
-	mask = 1L << ( bit_count - 1 );
+	mask = 1U << ( bit_count - 1 );
 	while ( mask != 0) {
 		if ( mask & data )	{
 			bitbuf->rack |= bitbuf->mask;
@@ -3330,7 +3330,7 @@ uint bitbuffer_get_unsigned( bitbuffer *bitbuf, int bit_count )
 	uint local_mask;
 	uint return_value;
 
-	local_mask = 1L << ( bit_count - 1 );
+	local_mask = 1U << ( bit_count - 1 );
 	return_value = 0;
 
 	while ( local_mask != 0)	{
@@ -3355,7 +3355,7 @@ int bitbuffer_get_signed( bitbuffer *bitbuf, int bit_count )
 	uint local_mask;
 	uint return_value;
 
-	local_mask = 1L << ( bit_count - 1 );
+	local_mask = 1U << ( bit_count - 1 );
 	return_value = 0;
 	while ( local_mask != 0)	{
 		if ( bitbuf->mask == 0x80 ) {
diff --git a/code/network/stand_gui-unix.cpp b/code/network/stand_gui-unix.cpp
@@ -131,18 +131,14 @@ class KickPlayerCommand: public WebapiCommand {
     }
 
 	void execute() override {
-        size_t foundPlayerIndex = MAX_PLAYERS;
-        for (size_t idx = 0; idx < MAX_PLAYERS; idx++) {
+        for (int idx = 0; idx < MAX_PLAYERS; idx++) {
             if (MULTI_CONNECTED(Net_players[idx])) {
                 if (Net_players[idx].player_id == mPlayerId) {
-                    foundPlayerIndex = idx;
+					multi_kick_player(idx, 0);
+					break;
                 }
             }
         }
-        
-        if (foundPlayerIndex < MAX_PLAYERS) {
-            multi_kick_player(foundPlayerIndex, 0);
-        }
     }
 private:
     int mPlayerId;
@@ -622,7 +618,7 @@ static bool webserverApiRequest(mg_connection *conn, const mg_request_info *ri)
 
                 std::string basicAuthValue = "Basic ";
 
-                basicAuthValue += base64_encode(reinterpret_cast<const unsigned char*>(userNameAndPassword.c_str()), userNameAndPassword.length());
+                basicAuthValue += base64_encode(reinterpret_cast<const unsigned char*>(userNameAndPassword.c_str()), static_cast<uint>(userNameAndPassword.length()));
 
                 const char* authValue = mg_get_header(conn, "Authorization");
                 if (authValue == NULL || strcmp(authValue, basicAuthValue.c_str()) != 0) {
diff --git a/code/parse/sexp.cpp b/code/parse/sexp.cpp
@@ -27633,8 +27633,9 @@ void maybe_write_to_event_log(int result)
 {
 	char buffer [256]; 
 
-	int mask = generate_event_log_flags_mask(result); 
-	sprintf(buffer, "Event: %s at mission time %d seconds (%d milliseconds)", Mission_events[Event_index].name.c_str(), f2i(Missiontime), f2i((longlong)Missiontime * MILLISECONDS_PER_SECOND));
+	int mask = generate_event_log_flags_mask(result);
+	int secs = f2i(Missiontime);
+	sprintf(buffer, "Event: %s at mission time %d seconds (%d milliseconds)", Mission_events[Event_index].name.c_str(), secs, secs * MILLISECONDS_PER_SECOND);
 	Current_event_log_buffer->push_back(buffer);
 		
 	if (!Snapshot_all_events && (!(mask &=  Mission_events[Event_index].mission_log_flags))) {
diff --git a/code/physics/physics.cpp b/code/physics/physics.cpp
@@ -1249,7 +1249,7 @@ bool physics_lead_ballistic_trajectory(const vec3d* start, const vec3d* end_pos,
 
 		time = range / (weapon_speed * cosf(angle));
 
-		if (abs(time - best_guess_time) < 0.01f)
+		if (std::abs(time - best_guess_time) < 0.01f)
 			break;
 		else
 			best_guess_time = time;
diff --git a/code/sound/ffmpeg/FFmpegWaveFile.cpp b/code/sound/ffmpeg/FFmpegWaveFile.cpp
@@ -151,9 +151,10 @@ FFmpegWaveFile::~FFmpegWaveFile()
 	av_frame_free(&m_decodeFrame);
 
 	if (m_audioCodecCtx) {
-		avcodec_close(m_audioCodecCtx);
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
 		avcodec_free_context(&m_audioCodecCtx);
+#else
+		avcodec_close(m_audioCodecCtx);
 #endif
 		m_audioCodecCtx = nullptr;
 	}
diff --git a/code/windows_stub/stubs.cpp b/code/windows_stub/stubs.cpp
@@ -43,7 +43,7 @@ int filelength(int fd)
 	if (fstat (fd, &buf) == -1)
 		return -1;
 
-	return buf.st_size;
+	return static_cast<int>(buf.st_size);
 }
 
 
@@ -199,7 +199,7 @@ void _splitpath (const char *path, char * /*drive*/, char *dir, char *fname, cha
 			lp = ls + strlen(ls);	// move to the end
 		}
 
-		int dist = lp-ls;
+		auto dist = lp-ls;
 
 		if (dist > (_MAX_FNAME-1))
 			dist = _MAX_FNAME-1;
diff --git a/freespace2/resources.cmake b/freespace2/resources.cmake
@@ -55,6 +55,8 @@ elseif(PLATFORM_MAC)
     set_target_properties(Freespace2 PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "${FSO_FULL_VERSION_STRING}")
     set_target_properties(Freespace2 PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${FSO_PRODUCT_VERSION_STRING}")
     set_target_properties(Freespace2 PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "FreeSpace Open")
+    set_target_properties(Freespace2 PROPERTIES MACOSX_DEPLOYMENT_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}")
+    set_target_properties(Freespace2 PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "us.indiegames.scp.FreeSpaceOpen")
     
     # Copy everything from the Resources directory
     add_custom_command(TARGET Freespace2 POST_BUILD
diff --git a/freespace2/resources/mac/Info.plist.in b/freespace2/resources/mac/Info.plist.in
@@ -17,7 +17,7 @@
 	<key>CFBundleName</key>
 	<string>FreeSpace Open</string>
 	<key>CFBundleIdentifier</key>
-	<string>us.indiegames.scp.FreeSpaceOpen</string>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ void lz41_load_offsets(CFILE* cf)`
`143`	`143`	`int* offsets_ptr = cf->compression_info.offsets;`
`144`	`144`
`145`	`145`	`/* Seek to the first offset position, remember to consider the trailing ints */`
`146`		`- fso_fseek(cf, ( ( sizeof(int) * cf->compression_info.num_offsets ) * -1 ) - (sizeof(int)*3 ), SEEK_END);`
	`146`	`+ fso_fseek(cf, static_cast<int>( ( sizeof(int) * cf->compression_info.num_offsets ) * -1 ) - (sizeof(int)*3 ), SEEK_END);`
`147`	`147`	`for (block = 0; block < cf->compression_info.num_offsets; ++block)`
`148`	`148`	`{`
`149`	`149`	`auto bytes_read = fread(offsets_ptr++, sizeof(int), 1, cf->fp);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`
	`2`	`+#ifdef _WIN32`
	`3`	`+`
`2`	`4`	`#include "headtracking/freetrack.h"`
`3`	`5`
`4`	`6`	`#define WIN32_LEAN_AND_MEAN`
`@@ -183,3 +185,5 @@ namespace headtracking`
`183`	`185`	`}`
`184`	`186`	`}`
`185`	`187`	`}`
	`188`	`+`
	`189`	`+#endif // _WIN32`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`#ifndef HEADTRACKING_FREETRACK_H`
`3`	`3`	`#define HEADTRACKING_FREETRACK_H`
`4`	`4`
	`5`	`+#ifdef _WIN32`
	`6`	`+`
`5`	`7`	`#include "headtracking/headtracking.h"`
`6`	`8`	`#include "headtracking/headtracking_internal.h"`
`7`	`9`
`@@ -92,4 +94,6 @@ namespace headtracking`
`92`	`94`	`}`
`93`	`95`	`}`
`94`	`96`
	`97`	`+#endif // _WIN32`
	`98`	`+`
`95`	`99`	`#endif // HEADTRACKING_FREETRACK_H`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`
	`2`	`+#ifdef _WIN32`
	`3`	`+`
`2`	`4`	`#include "headtracking/trackir.h"`
`3`	`5`
`4`	`6`	`#include "headtracking/trackirpublic.h"`
`@@ -53,3 +55,5 @@ namespace headtracking`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`	`}`
	`58`	`+`
	`59`	`+#endif // _WIN32`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`#ifndef HEADTRACKING_TRACKIR_H`
`3`	`3`	`#define HEADTRACKING_TRACKIR_H`
`4`	`4`
	`5`	`+#ifdef _WIN32`
	`6`	`+`
`5`	`7`	`#include "headtracking/headtracking.h"`
`6`	`8`	`#include "headtracking/headtracking_internal.h"`
`7`	`9`	`#include "headtracking/trackirpublic.h"`
`@@ -24,4 +26,6 @@ namespace headtracking`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`
	`29`	`+#endif // _WIN32`
	`30`	`+`
`27`	`31`	`#endif // HEADTRACKING_TRACKIR_H`