The-Homebrew-Cloud/WiiUPluginSystem
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginSystem.git synced 2024-07-01 07:46:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

ConfigItems: Use strdup for string duplication, rename configID to configId in WUPSConfigItemMultipleValues

Browse Source
This commit is contained in:
Maschell 2022-09-24 17:43:02 +02:00
parent e649e4c93d
commit c867b01e4d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wups/config/WUPSConfigItemMultipleValues.h
View File

@ -10,7 +10,7 @@ typedef struct ConfigItemMultipleValuesPair {
} ConfigItemMultipleValuesPair; } ConfigItemMultipleValuesPair;
typedef struct ConfigItemMultipleValues { typedef struct ConfigItemMultipleValues {
char *configID; char *configId;
WUPSConfigItemHandle handle; WUPSConfigItemHandle handle;
int32_t defaultValueIndex; int32_t defaultValueIndex;
int32_t valueIndex; int32_t valueIndex;
@ -21,7 +21,7 @@ typedef struct ConfigItemMultipleValues {
typedef void (*MultipleValuesChangedCallback)(ConfigItemMultipleValues *, uint32_t); typedef void (*MultipleValuesChangedCallback)(ConfigItemMultipleValues *, uint32_t);
bool WUPSConfigItemMultipleValues_AddToCategory(WUPSConfigCategoryHandle cat, const char *configID, const char *displayName, int defaultValueIndex, ConfigItemMultipleValuesPair *possibleValues, bool WUPSConfigItemMultipleValues_AddToCategory(WUPSConfigCategoryHandle cat, const char *configId, const char *displayName, int defaultValueIndex, ConfigItemMultipleValuesPair *possibleValues,
int pairCount, MultipleValuesChangedCallback callback); int pairCount, MultipleValuesChangedCallback callback);
#define WUPSConfigItemMultipleValues_AddToCategoryHandled(__config__, __cat__, __configID__, __displayName__, __defaultValueIndex__, __possibleValues__, __pairCount__, __callback__) \ #define WUPSConfigItemMultipleValues_AddToCategoryHandled(__config__, __cat__, __configID__, __displayName__, __defaultValueIndex__, __possibleValues__, __pairCount__, __callback__) \

14
libraries/libwups/WUPSConfigItemMultipleValues.cpp
View File

@ -73,7 +73,7 @@ void WUPSConfigItemMultipleValues_onSelected(void *context, bool isSelected) {
} }
extern "C" bool extern "C" bool
WUPSConfigItemMultipleValues_AddToCategory(WUPSConfigCategoryHandle cat, const char *configID, const char *displayName, WUPSConfigItemMultipleValues_AddToCategory(WUPSConfigCategoryHandle cat, const char *configId, const char *displayName,
int32_t defaultValueIndex, ConfigItemMultipleValuesPair *possibleValues, int32_t defaultValueIndex, ConfigItemMultipleValuesPair *possibleValues,
int pairCount, MultipleValuesChangedCallback callback) { int pairCount, MultipleValuesChangedCallback callback) {
if (cat == 0 || displayName == nullptr || possibleValues == nullptr || pairCount < 0) { if (cat == 0 || displayName == nullptr || possibleValues == nullptr || pairCount < 0) {
@ -103,12 +103,10 @@ WUPSConfigItemMultipleValues_AddToCategory(WUPSConfigCategoryHandle cat, const c
item->defaultValueIndex = defaultValueIndex; item->defaultValueIndex = defaultValueIndex;
item->callback = (void *) callback; item->callback = (void *) callback;
if (configID != nullptr) { if (configId != nullptr) {
auto configIDLen = strlen(configID) + 1; item->configId = strdup(configId);
item->configID = (char *) malloc(configIDLen);
strncpy(item->configID, configID, configIDLen);
} else { } else {
item->configID = nullptr; item->configId = nullptr;
} }
WUPSConfigCallbacks_t callbacks = { WUPSConfigCallbacks_t callbacks = {
@ -121,7 +119,7 @@ WUPSConfigItemMultipleValues_AddToCategory(WUPSConfigCategoryHandle cat, const c
.onButtonPressed = &WUPSConfigItemMultipleValues_onButtonPressed, .onButtonPressed = &WUPSConfigItemMultipleValues_onButtonPressed,
.onDelete = &WUPSConfigItemMultipleValues_onDelete}; .onDelete = &WUPSConfigItemMultipleValues_onDelete};
if (WUPSConfigItem_Create(&item->handle, configID, displayName, callbacks, item) < 0) { if (WUPSConfigItem_Create(&item->handle, configId, displayName, callbacks, item) < 0) {
free(item); free(item);
return false; return false;
} }
@ -140,7 +138,7 @@ void WUPSConfigItemMultipleValues_onDelete(void *context) {
free(item->values[i].valueName); free(item->values[i].valueName);
} }
free(item->configID); free(item->configId);
free(item->values); free(item->values);
free(item); free(item);