Attachment #189758 for bug #225187

View | Details | Raw Unified | Return to bug 225187
Collapse All | Expand All

Lines 31-36 Link Here

(-)Makefile (-1 / +2 lines)
31	libtheora.so:multimedia/libtheora	31	libtheora.so:multimedia/libtheora
32		32
33	USES= autoreconf jpeg lua:51 openal pkgconfig tar:lzma	33	USES= autoreconf jpeg lua:51 openal pkgconfig tar:lzma
		34	USE_CXXSTD= gnu++98
34	USE_GL= gl glu	35	USE_GL= gl glu
35	USE_SDL= sdl	36	USE_SDL= sdl
36	GNU_CONFIGURE= yes	37	GNU_CONFIGURE= yes
Lines 60-66 Link Here
60	"${PORTNAME}" "fs2_open_${PORTNAME}_launcher" \	61	"${PORTNAME}" "fs2_open_${PORTNAME}_launcher" \
61	"Game;Simulation;" false	62	"Game;Simulation;" false
62	WXLAUNCHER_PLIST_FILES= bin/fs2_open_${PORTNAME}_launcher \	63	WXLAUNCHER_PLIST_FILES= bin/fs2_open_${PORTNAME}_launcher \
63	%%DATADIR%%/fs2_open_${PORTNAME}	64	${DATADIR}/fs2_open_${PORTNAME}
64	WXLAUNCHER_RUN_DEPENDS= wxlauncher:games/wxlauncher	65	WXLAUNCHER_RUN_DEPENDS= wxlauncher:games/wxlauncher
65	WXLAUNCHER_SUB_FILES= fs2_open_${PORTNAME}_launcher	66	WXLAUNCHER_SUB_FILES= fs2_open_${PORTNAME}_launcher
66	WXLAUNCHER_VARS= PORTDATA+="resources .ini .png *.bmp"	67	WXLAUNCHER_VARS= PORTDATA+="resources .ini .png *.bmp"




# Fixes for a couple of clang warnings
# https://github.com/scp-fs2open/fs2open.github.com/commit/5bff2754c267f0e3e5af7d542f09a1760f24f17d

--- code/globalincs/safe_strings.cpp.orig	2012-01-13 18:37:09 UTC
+++ code/globalincs/safe_strings.cpp
@@ -22,11 +22,6 @@
 
 #if !defined(NO_SAFE_STRINGS) && ( !defined( _MSC_VER ) || ( defined( _MSC_VER ) && _MSC_VER >= 1400 /* && !defined(NDEBUG) */ ))
 
-/* We don't have this here - no standard library stuff included */
-#ifndef NULL
-#define NULL 0
-#endif
-
 /* An implementation of strcpy_s 
  * We're not going to actually fully behave like the MS debug version.
  */
@@ -39,14 +34,14 @@ errno_t scp_strcpy_s( const char* file, 
 	if ( !strDest || !strSource )
 	{
 		if ( strDest )
-			*strDest = NULL;
+			*strDest = '\0';
 		__safe_strings_error_handler( EINVAL );
 		return EINVAL;
 	}
 
 	if ( sizeInBytes == 0 )
 	{
-		*strDest = NULL;
+		*strDest = '\0';
 		__safe_strings_error_handler( ERANGE );
 		return ERANGE;
 	}
@@ -58,7 +53,7 @@ errno_t scp_strcpy_s( const char* file, 
 
 	if ( bufferLeft == 0 )
 	{
-		*strDest = NULL;
+		*strDest = '\0';
 		__safe_strings_error_handler( ERANGE );
 		return ERANGE;
 	}
@@ -75,14 +70,14 @@ errno_t scp_strcat_s( const char* file, 
 	if ( !strDest || !strSource )
 	{
 		if ( strDest )
-			*strDest = NULL;
+			*strDest = '\0';
 		__safe_strings_error_handler( EINVAL );
 		return EINVAL;
 	}
 
 	if ( bufferLeft == 0 )
 	{
-		*strDest = NULL;
+		*strDest = '\0';
 		__safe_strings_error_handler( ERANGE );
 		return ERANGE;
 	}
@@ -98,7 +93,7 @@ errno_t scp_strcat_s( const char* file, 
 
 	if ( bufferLeft == 0 )
 	{
-		*strDest = NULL;
+		*strDest = '\0';
 		__safe_strings_error_handler( ERANGE );
 		return ERANGE;
 	}
@@ -108,7 +103,7 @@ errno_t scp_strcat_s( const char* file, 
 
 	if ( bufferLeft == 0 )
 	{
-		*strDest = NULL;
+		*strDest = '\0';
 		__safe_strings_error_handler( ERANGE );
 		return ERANGE;
 	}

Return to bug 225187

Line 0 Link Here

(-)files/patch-code_globalincs_safe__strings.cpp (+78 lines)
		1	# Fixes for a couple of clang warnings
		2	# https://github.com/scp-fs2open/fs2open.github.com/commit/5bff2754c267f0e3e5af7d542f09a1760f24f17d
		3
		4	--- code/globalincs/safe_strings.cpp.orig 2012-01-13 18:37:09 UTC
		5	+++ code/globalincs/safe_strings.cpp
		6	@@ -22,11 +22,6 @@
		7
		8	#if !defined(NO_SAFE_STRINGS) && ( !defined( _MSC_VER ) \|\| ( defined( _MSC_VER ) && _MSC_VER >= 1400 /* && !defined(NDEBUG) */ ))
		9
		10	-/* We don't have this here - no standard library stuff included */
		11	-#ifndef NULL
		12	-#define NULL 0
		13	-#endif
		14	-
		15	/* An implementation of strcpy_s
		16	* We're not going to actually fully behave like the MS debug version.
		17	*/
		18	@@ -39,14 +34,14 @@ errno_t scp_strcpy_s( const char* file,
		19	if ( !strDest \|\| !strSource )
		20	{
		21	if ( strDest )
		22	- *strDest = NULL;
		23	+ *strDest = '\0';
		24	__safe_strings_error_handler( EINVAL );
		25	return EINVAL;
		26	}
		27
		28	if ( sizeInBytes == 0 )
		29	{
		30	- *strDest = NULL;
		31	+ *strDest = '\0';
		32	__safe_strings_error_handler( ERANGE );
		33	return ERANGE;
		34	}
		35	@@ -58,7 +53,7 @@ errno_t scp_strcpy_s( const char* file,
		36
		37	if ( bufferLeft == 0 )
		38	{
		39	- *strDest = NULL;
		40	+ *strDest = '\0';
		41	__safe_strings_error_handler( ERANGE );
		42	return ERANGE;
		43	}
		44	@@ -75,14 +70,14 @@ errno_t scp_strcat_s( const char* file,
		45	if ( !strDest \|\| !strSource )
		46	{
		47	if ( strDest )
		48	- *strDest = NULL;
		49	+ *strDest = '\0';
		50	__safe_strings_error_handler( EINVAL );
		51	return EINVAL;
		52	}
		53
		54	if ( bufferLeft == 0 )
		55	{
		56	- *strDest = NULL;
		57	+ *strDest = '\0';
		58	__safe_strings_error_handler( ERANGE );
		59	return ERANGE;
		60	}
		61	@@ -98,7 +93,7 @@ errno_t scp_strcat_s( const char* file,
		62
		63	if ( bufferLeft == 0 )
		64	{
65	- *strDest = NULL;
66	+ *strDest = '\0';
67	__safe_strings_error_handler( ERANGE );
68	return ERANGE;
69	}
70	@@ -108,7 +103,7 @@ errno_t scp_strcat_s( const char* file,
71
72	if ( bufferLeft == 0 )
73	{
74	- *strDest = NULL;
75	+ *strDest = '\0';
76	__safe_strings_error_handler( ERANGE );
77	return ERANGE;
78	}