From 064fe9c963b7aa0ea904ab15443198d965175461 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 16 May 2014 11:57:54 +0200 Subject: enum: Return boolean result for enum_from_name() lookup Handling the result for enum_from_name() is difficult, as checking for negative return values requires a cast if the enum type is unsigned. The new signature clearly differentiates lookup result from lookup value. Further, this actually allows to convert real -1 enum values, which could not be distinguished from "not-found" and the -1 return value. This also fixes several clang warnings where enums are unsigned. --- src/conftest/hooks/unsort_message.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/conftest/hooks/unsort_message.c') diff --git a/src/conftest/hooks/unsort_message.c b/src/conftest/hooks/unsort_message.c index 1b2b302af..399d2932a 100644 --- a/src/conftest/hooks/unsort_message.c +++ b/src/conftest/hooks/unsort_message.c @@ -69,8 +69,7 @@ METHOD(listener_t, message, bool, order = enumerator_create_token(this->order, ", ", " "); while (order->enumerate(order, &name)) { - type = enum_from_name(payload_type_short_names, name); - if (type != -1) + if (enum_from_name(payload_type_short_names, name, &type)) { enumerator = list->create_enumerator(list); while (enumerator->enumerate(enumerator, &payload)) -- cgit v1.2.3