izzy/ppsspp
0
0
Fork 0
mirror of https://github.com/izzy2lost/ppsspp.git synced 2026-03-10 12:43:04 -07: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
2014-06-29 17:41:33 -04:00
committed by greenbagels
parent 9919126e0a
commit c006bbd51b
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Core/Config.cpp
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
}

1
Core/Config.h
View File

@@ -337,7 +337,6 @@ public:
void GetReportingInfo(UrlEncoder &data);
std::string CreateRandMAC(); // Uses <cstdlib>'s rand() PRNG to create a pseudorandom MAC address
private:
std::string iniFilename_;