rtlib: fix gcc warnings in profiler report

- choose a suitable 64-bit decimal printf specifier
- choose a sutiable size_t printf specifier

Author: jayrm

src/rtlib/profile_calls.c

@@ -18,9 +18,21 @@
 
 #ifdef HOST_WIN32
 	#include <windows.h>
+	#include <inttypes.h>
 #endif
 #include <time.h>
 
+/* choose a suitable 64-bit decimal printf specifier */
+#if !defined(fmtlld)
+	#if defined(PRId64)
+		#define fmtlld PRId64
+	#elif defined(FB_LL_FMTMOD) 
+		#define fmtlld "%12" FB_LL_FMTMOD "d"
+	#else
+		#define fmtlld "%12lld"
+	#endif
+#endif
+
 /* procs */
 
 /* extra information about procinfo entry */
@@ -499,7 +511,7 @@ static void hProfilerReportCallsProc (
 		pad_spaces( f, len );
 
 		if( (prof->global->options & PROFILE_OPTION_HIDE_COUNTS) == 0 ) {
-			len = 14 - fprintf( f, "%12lld", parent_proc->local_count );
+			len = 14 - fprintf( f, fmtlld, parent_proc->local_count );
 			pad_spaces( f, len );
 		}
 
@@ -521,7 +533,7 @@ static void hProfilerReportCallsProc (
 			pad_spaces( f, len );
 
 			if( (prof->global->options & PROFILE_OPTION_HIDE_COUNTS) == 0 ) {
-				len = 14 - fprintf( f, "%12lld", proc->local_count );
+				len = 14 - fprintf( f, fmtlld, proc->local_count );
 				pad_spaces( f, len );
 			}
 
@@ -656,7 +668,7 @@ static void hProfilerReportCallsGlobals (
 		pad_spaces( f, len );
 
 		if( (prof->global->options & PROFILE_OPTION_HIDE_COUNTS) == 0 ) {
-			len = 14 - fprintf( f, "%12lld", proc->local_count );
+			len = 14 - fprintf( f, fmtlld, proc->local_count );
 			pad_spaces( f, len );
 		}
 
@@ -845,7 +857,7 @@ static void hProfilerReportRawList (
 			pad_spaces( f, len );
 
 			if( (prof->global->options & PROFILE_OPTION_HIDE_COUNTS) == 0 ) {
-				len = 14 - fprintf( f, "%12lld", proc->local_count );
+				len = 14 - fprintf( f, fmtlld, proc->local_count );
 				pad_spaces( f, len );
 			}
 
@@ -888,7 +900,7 @@ static void hProfilerReportRawDataProc (
 	pad_spaces( f, len );
 
 	if( (prof->global->options & PROFILE_OPTION_HIDE_COUNTS) == 0 ) {
-		len = 14 - fprintf( f, "%12lld", proc->local_count );
+		len = 14 - fprintf( f, fmtlld, proc->local_count );
 		pad_spaces( f, len );
 	}
 

src/rtlib/profile_cycles.c

@@ -16,8 +16,23 @@
 	#include <windows.h>
 #endif
 
+/* choose a suitable size_t printf specifier */
+#if !defined(fmtsizet)
+	#if defined(HOST_CYGWIN)
+		#define fmtsizet "%18Iu"
+	#elif defined(HOST_WIN32)
+		#if defined(_UCRT) || __USE_MINGW_ANSI_STDIO
+			#define fmtsizet "%18zu"
+		#else
+			#define fmtsizet "%18Iu"
+		#endif
+	#else
+		#define fmtsizet "%18zu"
+	#endif
+#endif
+
 /* profile section data */
-extern char __start_fb_profilecycledata;
+extern char __start_fb_profilecycledata[];
 extern char __stop_fb_profilecycledata;
 
 /* profiler record ids - these indicate what the record is */
@@ -255,7 +270,7 @@ static void hProfilerReport (
 		}
 
 		fprintf( f, "        %s\n", rec->proc_name );
-		fprintf( f, "                %18zu %18zu %18zu\n",
+		fprintf( f, "                " fmtsizet " " fmtsizet " " fmtsizet "\n",
 			rec->grand_total,
 			rec->internal_total,
 			rec->call_count
@@ -286,8 +301,8 @@ static void hProfilerWriteReport( FB_PROFILER_CYCLES *prof )
 		fprintf( f, "Total program execution time: %5.4g seconds\n", fb_Timer() - prof->start_time );
 	}
 
-	data = (unsigned char *)&__start_fb_profilecycledata;
-	length = (ssize_t)&__stop_fb_profilecycledata - (ssize_t)&__start_fb_profilecycledata;
+	data = (unsigned char *)&__start_fb_profilecycledata[0];
+	length = (ssize_t)&__stop_fb_profilecycledata - (ssize_t)&__start_fb_profilecycledata[0];
 
 	count = hProfilerCountProcs( data, length );
 	if( count ) {