preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-11 05:26:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change RandMAC function call to function pointer

Browse Source 
Left out .str() stringstream function

No need for forward declaration

Left an extra pair of parenthesis on CreateRandMAC

Something deleted a )...
This commit is contained in:
GreenBagels authored and greenbagels committed 2014-06-29 18:27:03 -04:00
1 parent 9919126e0a
commit c006bbd51b
2 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Config.cpp
+13 -12
View File
@@ -239,6 +239,18 @@ const char *DefaultLangRegion() {
return defaultLangRegion.c_str();
}
const char *CreateRandMAC() {
std::stringstream randStream;
srand(time(0));
for(int i = 0; i < 6; i++) {
randStream << std::hex << (rand() % 256); //generates each octet for the mac in hex format
if (i<5) {
randStream << ':'; //we need a : between every octet
}
}
return randStream.str().c_str(); //no need for creating a new string, just return this
}
static int DefaultNumWorkers() {
return cpu_info.num_cores;
}
@@ -539,7 +551,7 @@ static ConfigSetting systemParamSettings[] = {
ReportedConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE),
ConfigSetting("NickName", &g_Config.sNickName, "PPSSPP"),
ConfigSetting("proAdhocServer", &g_Config.proAdhocServer, "localhost"),
ConfigSetting("MacAddress", &g_Config.localMacAddress, g_Config.CreateRandMAC().c_str()),
ConfigSetting("MacAddress", &g_Config.localMacAddress, &CreateRandMAC),
ReportedConfigSetting("Language", &g_Config.iLanguage, &DefaultSystemParamLanguage),
ConfigSetting("TimeFormat", &g_Config.iTimeFormat, PSP_SYSTEMPARAM_TIME_FORMAT_24HR),
ConfigSetting("DateFormat", &g_Config.iDateFormat, PSP_SYSTEMPARAM_DATE_FORMAT_YYYYMMDD),
@@ -1014,15 +1026,4 @@ void Config::GetReportingInfo(UrlEncoder &data) {
}
}
std::string Config::CreateRandMAC() {
std::stringstream randStream;
srand(time(0));
for(int i = 0; i < 6; i++) {
randStream << std::hex << (rand() % 256); //generates each octet for the mac in hex format
if (i<5) {
randStream << ':'; //we need a : between every octet
}
}
return randStream.str(); //no need for creating a new string, just return this
}