Skip to content

Commit 51389fe

Browse files
NeeEooNeeEoo
committed
Merge branch 'master' into codename
2 parents 7b06adc + 08f88ff commit 51389fe

File tree

9 files changed

+45
-25
lines changed

9 files changed

+45
-25
lines changed

‎src/Dynamic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ class PointerData : public hx::Object
217217
String toString()
218218
{
219219
char buf[100];
220-
sprintf(buf,"Pointer(%p)", mValue);
220+
snprintf(buf,sizeof(buf),"Pointer(%p)", mValue);
221221
return String(buf);
222222
}
223223
String __ToString() const { return String(mValue); }

‎src/hx/CFFI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class Abstract_obj : public Object
106106
return _hxcpp_toString( Dynamic(this) );
107107

108108
char buffer[40];
109-
sprintf(buffer,"0x%p", mHandle);
109+
snprintf(buffer,sizeof(buffer),"0x%p", mHandle);
110110

111111
return HX_CSTRING("Abstract(") +
112112
__hxcpp_get_kind(this) +

‎src/hx/gc/Immix.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4632,11 +4632,11 @@ class GlobalAllocator
46324632

46334633
char strBuf[100];
46344634
if (bytes<k)
4635-
sprintf(strBuf,"%d", (int)bytes);
4635+
snprintf(strBuf,sizeof(strBuf),"%d", (int)bytes);
46364636
else if (bytes<meg)
4637-
sprintf(strBuf,"%.2fk", (double)bytes/k);
4637+
snprintf(strBuf,sizeof(strBuf),"%.2fk", (double)bytes/k);
46384638
else
4639-
sprintf(strBuf,"%.2fmb", (double)bytes/meg);
4639+
snprintf(strBuf,sizeof(strBuf),"%.2fmb", (double)bytes/meg);
46404640
return strBuf;
46414641
}
46424642
#endif

‎src/hx/libs/mysql/my_api.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ static void error( MYSQL *m, const char *err, const char *param ) {
2525
p2[max - 2] = '.';
2626
p2[max - 1] = '.';
2727
p2[max] = 0;
28-
sprintf(m->last_error,err,param);
28+
snprintf(m->last_error,sizeof(m->last_error),err,param);
2929
free(p2);
3030
return;
3131
}
3232
}
33-
sprintf(m->last_error,err,param);
33+
snprintf(m->last_error,sizeof(m->last_error),err,param);
3434
m->errcode = -1;
3535
}
3636

@@ -408,7 +408,7 @@ const char *mysql_character_set_name( MYSQL *m ) {
408408
const char *name = myp_charset_name(m->infos.server_charset);
409409
if( name == NULL ) {
410410
static char tmp[512];
411-
sprintf(tmp,"#%d",m->infos.server_charset);
411+
snprintf(tmp,sizeof(tmp),"#%d",m->infos.server_charset);
412412
return tmp;
413413
}
414414
return name;

‎toolchain/appletvos-toolchain.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
<!-- <cppflag value="-fvisibility-inlines-hidden"/> -->
2525
<pchflag value="-x" />
2626
<pchflag value="c++-header" />
27-
<flag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
28-
<flag value="-stdlib=libc++" if="HXCPP_CPP11" />
27+
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
28+
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
29+
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
30+
<mmflag value="-stdlib=libc++" if="HXCPP_CPP11" />
2931
<flag value="-g" if="HXCPP_DEBUG_LINK"/>
3032
<flag value="-O2" unless="debug"/>
3133
<flag value="-arch"/>
@@ -69,8 +71,10 @@
6971
<linker id="dll" exe="g++" >
7072
<exe name="xcrun --sdk appletvos${TVOS_VER} g++" if="HXCPP_GCC" />
7173
<exe name="xcrun --sdk appletvos${TVOS_VER} clang++" />
72-
<flag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
73-
<flag value="-stdlib=libc++" if="HXCPP_CPP11" />
74+
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
75+
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
76+
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
77+
<mmflag value="-stdlib=libc++" if="HXCPP_CPP11" />
7478
<flag value="-dynamiclib"/>
7579
<flag value="-arch"/>
7680
<flag value="arm64" if="HXCPP_ARM64" />

‎toolchain/appletvsim-toolchain.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
<!-- <cppflag value="-fvisibility-inlines-hidden"/> -->
2323
<pchflag value="-x" />
2424
<pchflag value="c++-header" />
25-
<flag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
26-
<flag value="-stdlib=libc++" if="HXCPP_CPP11" />
25+
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
26+
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
27+
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
28+
<mmflag value="-stdlib=libc++" if="HXCPP_CPP11" />
2729
<flag value="-g" if="HXCPP_DEBUG_LINK"/>
2830
<flag value="-O2" unless="debug"/>
2931
<flag value="-fmessage-length=0"/>
@@ -76,8 +78,10 @@
7678
<linker id="dll" exe="g++" >
7779
<exe name="xcrun --sdk appletvsimulator${TVOS_VER} g++" if="HXCPP_GCC" />
7880
<exe name="xcrun --sdk appletvsimulator${TVOS_VER} clang++" />
79-
<flag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
80-
<flag value="-stdlib=libc++" if="HXCPP_CPP11" />
81+
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
82+
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
83+
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
84+
<mmflag value="-stdlib=libc++" if="HXCPP_CPP11" />
8185
<flag value="-dynamiclib"/>
8286
<flag value="-arch"/>
8387
<flag value="i386" unless="HXCPP_M64"/>

‎toolchain/iphoneos-toolchain.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,10 @@
9595
<exe name="xcrun --sdk iphoneos${IPHONE_VER} g++" if="HXCPP_GCC" />
9696
<exe name="xcrun --sdk iphoneos${IPHONE_VER} clang++" />
9797
<flag value="-Wl,-cache_path_lto,/tmp" if="HXCPP_OPTIMIZE_LINK_INCREMENTAL" unless="debug"/>
98-
<flag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
99-
<flag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
98+
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
99+
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
100+
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
101+
<mmflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
100102
<flag value="-dynamiclib"/>
101103
<flag value="-arch"/>
102104
<flag value="armv6" if="HXCPP_ARMV6" />

‎toolchain/iphonesim-toolchain.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@
8989
<linker id="dll" exe="g++" >
9090
<exe name="xcrun --sdk iphonesimulator${IPHONE_VER} g++" if="HXCPP_GCC" />
9191
<exe name="xcrun --sdk iphonesimulator${IPHONE_VER} clang++" />
92-
<flag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
93-
<flag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
92+
<cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
93+
<cppflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
94+
<mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
95+
<mmflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17" />
9496
<flag value="-dynamiclib"/>
9597
<flag value="-arch"/>
9698
<flag value="i386" unless="HXCPP_M64"/>

‎toolchain/mac-toolchain.xml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@
3131
<cppflag value="-Wc++14-extensions" if="HXCPP_CPP14"/>
3232
<cppflag value="-std=c++17" if="HXCPP_CPP17"/>
3333
<cppflag value="-Wc++17-extensions" if="HXCPP_CPP17"/>
34-
<flag value="-stdlib=libc++" unless="STDLIBCPP" />
35-
<flag value="-stdlib=libstdc++" if="STDLIBCPP" />
34+
<cppflag value="-stdlib=libc++" unless="STDLIBCPP" />
35+
<cppflag value="-stdlib=libstdc++" if="STDLIBCPP" />
36+
<mmflag value="-stdlib=libc++" unless="STDLIBCPP" />
37+
<mmflag value="-stdlib=libstdc++" if="STDLIBCPP" />
38+
3639
<cppflag value="-frtti"/>
3740
<pchflag value="-x" />
3841
<pchflag value="c++-header" />
@@ -74,8 +77,10 @@
7477
<fromfile value="" if="GCC_OLD" />
7578
<flag value="-Wl,-bundle,-bundle_loader,${dll_import_link}" if="dll_import_link" />
7679
<flag value="-Wl,-cache_path_lto,/tmp" if="HXCPP_LTO_THIN" unless="debug"/>
77-
<flag value="-stdlib=libc++" unless="STDLIBCPP" />
78-
<flag value="-stdlib=libstdc++" if="STDLIBCPP" />
80+
<cppflag value="-stdlib=libc++" unless="STDLIBCPP" />
81+
<cppflag value="-stdlib=libstdc++" if="STDLIBCPP" />
82+
<mmflag value="-stdlib=libc++" unless="STDLIBCPP" />
83+
<mmflag value="-stdlib=libstdc++" if="STDLIBCPP" />
7984
<flag value="-fpic"/>
8085
<flag value="-fPIC"/>
8186
<flag value="-dynamiclib"/>
@@ -99,7 +104,10 @@
99104
<flag value="-Wl,-rpath,${HXCPP_RPATH}" if="HXCPP_RPATH" />
100105
<flag value="-Wl,-cache_path_lto,/tmp" if="HXCPP_OPTIMIZE_LINK_INCREMENTAL" unless="debug"/>
101106
<fromfile value="" if="GCC_OLD" />
102-
<flag value="-stdlib=libstdc++" if="STDLIBCPP" />
107+
<cppflag value="-stdlib=libc++" unless="STDLIBCPP" />
108+
<cppflag value="-stdlib=libstdc++" if="STDLIBCPP" />
109+
<mmflag value="-stdlib=libc++" unless="STDLIBCPP" />
110+
<mmflag value="-stdlib=libstdc++" if="STDLIBCPP" />
103111
<flag value="-framework"/>
104112
<flag value="Cocoa"/>
105113
<flag value="-isysroot" unless="LEGACY_MACOSX_SDK"/>

0 commit comments

Comments
 (0)