summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/settings.c b/apps/settings.c
index b76468280e..98cd6ebc95 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1083,7 +1083,7 @@ bool set_int(const unsigned char* string,
1083 int step, 1083 int step,
1084 int min, 1084 int min,
1085 int max, 1085 int max,
1086 void (*formatter)(char*, size_t, int, const char*) ) 1086 const char* (*formatter)(char*, size_t, int, const char*) )
1087{ 1087{
1088 return set_int_ex(string, unit, voice_unit, variable, function, 1088 return set_int_ex(string, unit, voice_unit, variable, function,
1089 step, min, max, formatter, NULL); 1089 step, min, max, formatter, NULL);
@@ -1097,7 +1097,7 @@ bool set_int_ex(const unsigned char* string,
1097 int step, 1097 int step,
1098 int min, 1098 int min,
1099 int max, 1099 int max,
1100 void (*formatter)(char*, size_t, int, const char*), 1100 const char* (*formatter)(char*, size_t, int, const char*),
1101 int32_t (*get_talk_id)(int, int)) 1101 int32_t (*get_talk_id)(int, int))
1102{ 1102{
1103 (void)unit; 1103 (void)unit;
@@ -1117,17 +1117,18 @@ bool set_int_ex(const unsigned char* string,
1117 1117
1118 1118
1119static const struct opt_items *set_option_options; 1119static const struct opt_items *set_option_options;
1120static void set_option_formatter(char* buf, size_t size, int item, const char* unit) 1120static const char* set_option_formatter(char* buf, size_t size, int item, const char* unit)
1121{ 1121{
1122 (void)unit; 1122 (void)buf, (void)unit, (void)size;
1123 const unsigned char *text = set_option_options[item].string; 1123 return P2STR(set_option_options[item].string);
1124 strlcpy(buf, P2STR(text), size);
1125} 1124}
1125
1126static int32_t set_option_get_talk_id(int value, int unit) 1126static int32_t set_option_get_talk_id(int value, int unit)
1127{ 1127{
1128 (void)unit; 1128 (void)unit;
1129 return set_option_options[value].voice_id; 1129 return set_option_options[value].voice_id;
1130} 1130}
1131
1131bool set_option(const char* string, const void* variable, enum optiontype type, 1132bool set_option(const char* string, const void* variable, enum optiontype type,
1132 const struct opt_items* options, 1133 const struct opt_items* options,
1133 int numoptions, void (*function)(int)) 1134 int numoptions, void (*function)(int))