Merge branch 'smartcmd:main' into main

1 files changed, 8 insertions, 8 deletions

diff --git a/Minecraft.Client/Orbis/Network/SonyHttp_Orbis.cpp b/Minecraft.Client/Orbis/Network/SonyHttp_Orbis.cpp
index 7f7c62d6..3387839f 100644
--- a/Minecraft.Client/Orbis/Network/SonyHttp_Orbis.cpp
+++ b/Minecraft.Client/Orbis/Network/SonyHttp_Orbis.cpp
@@ -100,16 +100,16 @@ void SonyHttp_Orbis::printSslError(SceInt32 sslErr, SceUInt32 sslErrDetail)
 void SonyHttp_Orbis::printSslCertInfo(int libsslCtxId,SceSslCert *sslCert)
 {
 	SceInt32 ret;
-	SceUChar8 *sboData = NULL ;
+	SceUChar8 *sboData = nullptr ;
 	SceSize sboLen, counter;
 
-	ret = sceSslGetSerialNumber(libsslCtxId, sslCert, NULL, &sboLen);
+	ret = sceSslGetSerialNumber(libsslCtxId, sslCert, nullptr, &sboLen);
 	if (ret < 0){
 		app.DebugPrintf("sceSslGetSerialNumber() returns 0x%x\n", ret);
 	}
 	else {
-		sboData = (SceUChar8*)malloc(sboLen);
-		if ( sboData != NULL ) {
+		sboData = static_cast<SceUChar8 *>(malloc(sboLen));
+		if ( sboData != nullptr ) {
 			ret = sceSslGetSerialNumber(libsslCtxId, sslCert, sboData, &sboLen);
 			if (ret < 0){
 				app.DebugPrintf ("sceSslGetSerialNumber() returns 0x%x\n", ret);
@@ -141,10 +141,10 @@ SceInt32 SonyHttp_Orbis::sslCallback(int libsslCtxId,unsigned int verifyErr,SceS
 	(void)userArg;
 
 	app.DebugPrintf("Ssl callback:\n");
-	app.DebugPrintf("\tbase tmpl[%x]\n", (*(SceInt32*)(userArg)) );
+	app.DebugPrintf("\tbase tmpl[%x]\n", (*static_cast<SceInt32 *>(userArg)) );
 
 	if (verifyErr != 0){
-		printSslError((SceInt32)SCE_HTTPS_ERROR_CERT, verifyErr);
+		printSslError(static_cast<SceInt32>(SCE_HTTPS_ERROR_CERT), verifyErr);
 	}
 	for (i = 0; i < certNum; i++){
 		printSslCertInfo(libsslCtxId,sslCert[i]);
@@ -202,7 +202,7 @@ bool SonyHttp_Orbis::http_get(const char *targetUrl, void** ppOutData, int* pDat
 	}
 
 	/* Register SSL callback */
-	ret = sceHttpsSetSslCallback(tmplId, sslCallback, (void*)&tmplId);
+	ret = sceHttpsSetSslCallback(tmplId, sslCallback, static_cast<void *>(&tmplId));
 	if (ret < 0) 
 	{
 		app.DebugPrintf("sceHttpsSetSslCallback() error: 0x%08X\n", ret);
@@ -225,7 +225,7 @@ bool SonyHttp_Orbis::http_get(const char *targetUrl, void** ppOutData, int* pDat
 	}
 	reqId = ret;
 
-	ret = sceHttpSendRequest(reqId, NULL, 0);
+	ret = sceHttpSendRequest(reqId, nullptr, 0);
 	if (ret < 0)
 	{
 		app.DebugPrintf("sceHttpSendRequest() error: 0x%08X\n", ret);