riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3266 from Lotterleben/aodvv2_fix_warn

Browse Source 
aodvv2: fix return values of reader helper functions
This commit is contained in:
Lotte Steenbrink 2015-06-29 12:13:47 +02:00
commit 04719b326c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/routing/aodvv2/reader.c
View File

@ -725,7 +725,7 @@ int aodv_packet_reader_handle_packet(void *buffer, size_t length, struct netaddr
/* /*
* Cost(L): Get Cost of a Link regarding the specified metric. * Cost(L): Get Cost of a Link regarding the specified metric.
* (currently only AODVV2_DEFAULT_METRIC_TYPE (HopCount) implemented) * (currently only AODVV2_DEFAULT_METRIC_TYPE (HopCount) implemented)
* returns cost if metric is known, NULL otherwise * returns cost if metric is known, 0 otherwise
*/ */
static uint8_t _get_link_cost(aodvv2_metric_t metricType) static uint8_t _get_link_cost(aodvv2_metric_t metricType)
{ {
@ -737,7 +737,7 @@ static uint8_t _get_link_cost(aodvv2_metric_t metricType)
/* /*
* MAX_METRIC[MetricType]: * MAX_METRIC[MetricType]:
* returns maximum value of the given metric if metric is known, NULL otherwise. * returns maximum value of the given metric if metric is known, 0 otherwise.
*/ */
static uint8_t _get_max_metric(aodvv2_metric_t metricType) static uint8_t _get_max_metric(aodvv2_metric_t metricType)
{ {
@ -751,11 +751,12 @@ static uint8_t _get_max_metric(aodvv2_metric_t metricType)
* Cost(R): Get Cost of a Route regarding the specified metric, based on the * Cost(R): Get Cost of a Route regarding the specified metric, based on the
* earlier metric value of the Route. * earlier metric value of the Route.
* (currently only AODVV2_DEFAULT_METRIC_TYPE (HopCount) implemented) * (currently only AODVV2_DEFAULT_METRIC_TYPE (HopCount) implemented)
* returns cost if metric is known, NULL otherwise * returns cost if metric is known, 0 otherwise
*/ */
static uint8_t _get_route_cost(aodvv2_metric_t metricType, uint8_t metric) static uint8_t _get_route_cost(aodvv2_metric_t metricType, uint8_t metric)
{ {
if (metricType == AODVV2_DEFAULT_METRIC_TYPE){ if (metricType == AODVV2_DEFAULT_METRIC_TYPE){
return metric + _get_link_cost(AODVV2_DEFAULT_METRIC_TYPE); return metric + _get_link_cost(AODVV2_DEFAULT_METRIC_TYPE);
} }
return 0;
} }