From 25c20d67addf55a22e3e2a9c0ba0abcae5733fb5 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Thu, 8 Nov 2018 10:32:34 +0100 Subject: [PATCH] channel: Fix #219 get_modifier and get_type seems to work incorrectly Untested attempt to fix issue #219: iio_channel_get_modifier and iio_channel_get_type seems to work incorrectly. Signed-off-by: Michael Hennerich --- channel.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/channel.c b/channel.c index ccecf8e41..26d849719 100644 --- a/channel.c +++ b/channel.c @@ -141,7 +141,7 @@ void iio_channel_init_finalize(struct iio_channel *chn) if (strncmp(iio_chan_type_name_spec[i], chn->id, len) != 0) continue; /* Type must be followed by either a '_' or a digit */ - if (chn->id[len] != '_' && chn->id[len] < '0' && chn->id[len] > '9') + if (chn->id[len] != '_' && (chn->id[len] < '0' || chn->id[len] > '9')) continue; chn->type = (enum iio_chan_type) i; @@ -159,9 +159,6 @@ void iio_channel_init_finalize(struct iio_channel *chn) len = strlen(modifier_names[i]); if (strncmp(modifier_names[i], mod, len) != 0) continue; - /* Modifier must be followed by a '_' */ - if (mod[len] != '_') - continue; chn->modifier = (enum iio_modifier) i; break;