|
@@ -295,8 +295,8 @@ struct settings * find_child_settings ( struct settings *parent,
|
295
|
295
|
* @v name Name within this parent
|
296
|
296
|
* @ret settings Settings block, or NULL
|
297
|
297
|
*/
|
298
|
|
-static struct settings * autovivify_child_settings ( struct settings *parent,
|
299
|
|
- const char *name ) {
|
|
298
|
+struct settings * autovivify_child_settings ( struct settings *parent,
|
|
299
|
+ const char *name ) {
|
300
|
300
|
struct {
|
301
|
301
|
struct autovivified_settings autovivified;
|
302
|
302
|
char name[ strlen ( name ) + 1 /* NUL */ ];
|
|
@@ -356,9 +356,7 @@ const char * settings_name ( struct settings *settings ) {
|
356
|
356
|
* @ret settings Settings block, or NULL
|
357
|
357
|
*/
|
358
|
358
|
static struct settings *
|
359
|
|
-parse_settings_name ( const char *name,
|
360
|
|
- struct settings * ( * get_child ) ( struct settings *,
|
361
|
|
- const char * ) ) {
|
|
359
|
+parse_settings_name ( const char *name, get_child_settings_t get_child ) {
|
362
|
360
|
struct settings *settings = &settings_root;
|
363
|
361
|
char name_copy[ strlen ( name ) + 1 ];
|
364
|
362
|
char *subname;
|
|
@@ -1205,12 +1203,8 @@ static struct setting_type * find_setting_type ( const char *name ) {
|
1205
|
1203
|
* Note that on success, this function will have modified the original
|
1206
|
1204
|
* setting @c name.
|
1207
|
1205
|
*/
|
1208
|
|
-static int
|
1209
|
|
-parse_setting_name ( char *name,
|
1210
|
|
- struct settings * ( * get_child )
|
1211
|
|
- ( struct settings *settings,
|
1212
|
|
- const char *name ),
|
1213
|
|
- struct settings **settings, struct setting *setting ) {
|
|
1206
|
+int parse_setting_name ( char *name, get_child_settings_t get_child,
|
|
1207
|
+ struct settings **settings, struct setting *setting ) {
|
1214
|
1208
|
char *settings_name;
|
1215
|
1209
|
char *setting_name;
|
1216
|
1210
|
char *type_name;
|