From 8ece46d5d2b52725c3e3d196c4de8c2d9b1d8c96 Mon Sep 17 00:00:00 2001 From: sg Date: Wed, 27 Jul 2016 20:28:39 +0200 Subject: [PATCH] snmp threadsync_data: "u8" -> "err" (typedef snmp_err_t is an enum, not u8_t) --- src/apps/snmp/snmp_threadsync.c | 16 ++++++++-------- src/include/lwip/apps/snmp_threadsync.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/apps/snmp/snmp_threadsync.c b/src/apps/snmp/snmp_threadsync.c index 88957a04..858c40e6 100644 --- a/src/apps/snmp/snmp_threadsync.c +++ b/src/apps/snmp/snmp_threadsync.c @@ -76,7 +76,7 @@ threadsync_set_test_synced(void *ctx) { struct threadsync_data *call_data = (struct threadsync_data*)ctx; - call_data->retval.u8 = call_data->proxy_instance.set_test(&call_data->proxy_instance, call_data->arg2.len, call_data->arg1.value); + call_data->retval.err = call_data->proxy_instance.set_test(&call_data->proxy_instance, call_data->arg2.len, call_data->arg1.value); sys_sem_signal(&call_data->threadsync_node->instance->sem); } @@ -90,7 +90,7 @@ threadsync_set_test(struct snmp_node_instance* instance, u16_t len, void *value) call_data->arg2.len = len; call_synced_function(call_data, threadsync_set_test_synced); - return call_data->retval.u8; + return call_data->retval.err; } static void @@ -98,7 +98,7 @@ threadsync_set_value_synced(void *ctx) { struct threadsync_data *call_data = (struct threadsync_data*)ctx; - call_data->retval.u8 = call_data->proxy_instance.set_value(&call_data->proxy_instance, call_data->arg2.len, call_data->arg1.value); + call_data->retval.err = call_data->proxy_instance.set_value(&call_data->proxy_instance, call_data->arg2.len, call_data->arg1.value); sys_sem_signal(&call_data->threadsync_node->instance->sem); } @@ -112,7 +112,7 @@ threadsync_set_value(struct snmp_node_instance* instance, u16_t len, void *value call_data->arg2.len = len; call_synced_function(call_data, threadsync_set_value_synced); - return call_data->retval.u8; + return call_data->retval.err; } static void @@ -141,7 +141,7 @@ get_instance_synced(void* ctx) struct threadsync_data *call_data = (struct threadsync_data*)ctx; const struct snmp_leaf_node *leaf = (const struct snmp_leaf_node*)(const void*)call_data->proxy_instance.node; - call_data->retval.u8 = leaf->get_instance(call_data->arg1.root_oid, call_data->arg2.root_oid_len, &call_data->proxy_instance); + call_data->retval.err = leaf->get_instance(call_data->arg1.root_oid, call_data->arg2.root_oid_len, &call_data->proxy_instance); sys_sem_signal(&call_data->threadsync_node->instance->sem); } @@ -152,7 +152,7 @@ get_next_instance_synced(void* ctx) struct threadsync_data *call_data = (struct threadsync_data*)ctx; const struct snmp_leaf_node *leaf = (const struct snmp_leaf_node*)(const void*)call_data->proxy_instance.node; - call_data->retval.u8 = leaf->get_next_instance(call_data->arg1.root_oid, call_data->arg2.root_oid_len, &call_data->proxy_instance); + call_data->retval.err = leaf->get_next_instance(call_data->arg1.root_oid, call_data->arg2.root_oid_len, &call_data->proxy_instance); sys_sem_signal(&call_data->threadsync_node->instance->sem); } @@ -180,7 +180,7 @@ do_sync(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* ins call_data->arg2.root_oid_len = root_oid_len; call_synced_function(call_data, fn); - if (call_data->retval.u8 == SNMP_ERR_NOERROR) { + if (call_data->retval.err == SNMP_ERR_NOERROR) { instance->access = call_data->proxy_instance.access; instance->asn1_type = call_data->proxy_instance.asn1_type; instance->release_instance = threadsync_release_instance; @@ -190,7 +190,7 @@ do_sync(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* ins snmp_oid_assign(&instance->instance_oid, call_data->proxy_instance.instance_oid.id, call_data->proxy_instance.instance_oid.len); } - return call_data->retval.u8; + return call_data->retval.err; } snmp_err_t diff --git a/src/include/lwip/apps/snmp_threadsync.h b/src/include/lwip/apps/snmp_threadsync.h index 75e0d2c2..a25dbf2d 100644 --- a/src/include/lwip/apps/snmp_threadsync.h +++ b/src/include/lwip/apps/snmp_threadsync.h @@ -57,7 +57,7 @@ typedef void (*snmp_threadsync_synchronizer_fn)(snmp_threadsync_called_fn fn, vo struct threadsync_data { union { - snmp_err_t u8; + snmp_err_t err; s16_t s16; } retval; union {