diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-15 17:46:04 +0200 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-15 22:08:00 +0200 |
commit | 2467e15efe5cba2fcd81e4066203a25c2d941e14 (patch) | |
tree | ae5470e9eda91ec49a3f1669c92d45de0bf3c3bb /src | |
parent | 5c3bcca0c7981f05220f866e8625c03330c9a1b4 (diff) | |
download | dt-utils-2467e15efe5cba2fcd81e4066203a25c2d941e14.tar.gz dt-utils-2467e15efe5cba2fcd81e4066203a25c2d941e14.tar.xz |
barebox-state: add __ prefix to get, set, info function to avoid clash with barebox functions
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'src')
-rw-r--r-- | src/barebox-state.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/barebox-state.c b/src/barebox-state.c index 61ea160..5909530 100644 --- a/src/barebox-state.c +++ b/src/barebox-state.c @@ -42,13 +42,13 @@ static int verbose; struct state_variable; -static int state_uint32_set(struct state_variable *var, const char *val); -static char *state_uint32_get(struct state_variable *var); -static int state_enum32_set(struct state_variable *sv, const char *val); -static char *state_enum32_get(struct state_variable *var); -static void state_enum32_info(struct state_variable *var); -static int state_mac_set(struct state_variable *var, const char *val); -static char *state_mac_get(struct state_variable *var); +static int __state_uint32_set(struct state_variable *var, const char *val); +static char *__state_uint32_get(struct state_variable *var); +static int __state_enum32_set(struct state_variable *sv, const char *val); +static char *__state_enum32_get(struct state_variable *var); +static void __state_enum32_info(struct state_variable *var); +static int __state_mac_set(struct state_variable *var, const char *val); +static char *__state_mac_get(struct state_variable *var); #define asprintf(fmt, arg...) barebox_asprintf(fmt, ##arg) @@ -400,25 +400,25 @@ static struct variable_type types[] = { .export = state_uint32_export, .import = state_uint32_import, .create = state_uint32_create, - .set = state_uint32_set, - .get = state_uint32_get, + .set = __state_uint32_set, + .get = __state_uint32_get, }, { .type = STATE_TYPE_ENUM, .type_name = "enum32", .export = state_enum32_export, .import = state_enum32_import, .create = state_enum32_create, - .set = state_enum32_set, - .get = state_enum32_get, - .info = state_enum32_info, + .set = __state_enum32_set, + .get = __state_enum32_get, + .info = __state_enum32_info, }, { .type = STATE_TYPE_MAC, .type_name = "mac", .export = state_mac_export, .import = state_mac_import, .create = state_mac_create, - .set = state_mac_set, - .get = state_mac_get, + .set = __state_mac_set, + .get = __state_mac_get, }, }; @@ -1509,7 +1509,7 @@ static struct variable_type *state_find_type(enum state_variable_type type) return NULL; } -static int state_uint32_set(struct state_variable *var, const char *val) +static int __state_uint32_set(struct state_variable *var, const char *val) { struct state_uint32 *su32 = to_state_uint32(var); @@ -1518,7 +1518,7 @@ static int state_uint32_set(struct state_variable *var, const char *val) return 0; } -static char *state_uint32_get(struct state_variable *var) +static char *__state_uint32_get(struct state_variable *var) { struct state_uint32 *su32 = to_state_uint32(var); char *str; @@ -1532,7 +1532,7 @@ static char *state_uint32_get(struct state_variable *var) } -static int state_enum32_set(struct state_variable *sv, const char *val) +static int __state_enum32_set(struct state_variable *sv, const char *val) { struct state_enum32 *enum32 = to_state_enum32(sv); int i; @@ -1547,7 +1547,7 @@ static int state_enum32_set(struct state_variable *sv, const char *val) return -EINVAL; } -static char *state_enum32_get(struct state_variable *var) +static char *__state_enum32_get(struct state_variable *var) { struct state_enum32 *enum32 = to_state_enum32(var); char *str; @@ -1560,7 +1560,7 @@ static char *state_enum32_get(struct state_variable *var) return str; } -static void state_enum32_info(struct state_variable *var) +static void __state_enum32_info(struct state_variable *var) { struct state_enum32 *enum32 = to_state_enum32(var); int i; @@ -1595,7 +1595,7 @@ static int string_to_ethaddr(const char *str, uint8_t enetaddr[6]) return 0; } -static int state_mac_set(struct state_variable *var, const char *val) +static int __state_mac_set(struct state_variable *var, const char *val) { struct state_mac *mac = to_state_mac(var); uint8_t mac_save[6]; @@ -1610,7 +1610,7 @@ static int state_mac_set(struct state_variable *var, const char *val) return 0; } -static char *state_mac_get(struct state_variable *var) +static char *__state_mac_get(struct state_variable *var) { struct state_mac *mac = to_state_mac(var); char *str; |