From 23a378dab7d7afcb86359d62094597a1c50c6767 Mon Sep 17 00:00:00 2001 From: Bintian Wang Date: Mon, 22 Jul 2013 18:14:56 +0800 Subject: Change the judgement of return value of posix functions(e.g. timer_gettime) from "-1 == ret" to "ret < 0" Signed-off-by: Bintian Wang --- evdevtest/juice_evtest.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/evdevtest/juice_evtest.c b/evdevtest/juice_evtest.c index e2e0ccc..e910b24 100644 --- a/evdevtest/juice_evtest.c +++ b/evdevtest/juice_evtest.c @@ -61,14 +61,14 @@ static int suspend_resume_test(const int seconds) } ret = timer_create(CLOCK_REALTIME_ALARM, &se, &timerid); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Create alarm timer failed"); return -1; } memset(&its, 0, sizeof(struct itimerspec)); ret = clock_gettime(CLOCK_REALTIME_ALARM, &its.it_value); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Get time failed"); return -1; } @@ -76,28 +76,28 @@ static int suspend_resume_test(const int seconds) its.it_value.tv_sec += seconds; ret = timer_settime(timerid, TIMER_ABSTIME, &its, NULL); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Set alarm timer failed"); return -1; } /*record the suspend start time*/ ret = clock_gettime(CLOCK_REALTIME, &t1); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Get start time of suspend failed"); return -1; } /*start suspend the system now*/ ret = system("echo mem > /sys/power/state"); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("echo mem to power state failed"); return -1; } /*record the system resume time*/ ret = clock_gettime(CLOCK_REALTIME, &t2); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Get the suspend end time failed"); return -1; } @@ -189,7 +189,7 @@ int main (int argc, char **argv) /*Start generating input event*/ ret = system("echo 1 > /sys/juice_input/run"); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Enable generate input event failed"); goto para_test; } @@ -218,7 +218,7 @@ int main (int argc, char **argv) /*Stop generateing input event*/ ret = system("echo 0 > /sys/juice_input/run"); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Disable generate input event failed"); goto para_test; } @@ -230,7 +230,7 @@ para_test: /* Null parameters test!*/ printf("Starting test EVIOCGSUSPENDBLOCK/EVIOCSSUSPENDBLOCK with different parameters:\n"); ret = ioctl(fd, EVIOCGSUSPENDBLOCK); - if (-1 == ret) + if (ret < 0) printf("[EVDEV_TEST8]: test passed\n"); else printf("[EVDEV_TEST8]: test failed\n"); @@ -287,7 +287,7 @@ para_test: clk = CLOCK_REALTIME_ALARM; ret = ioctl(fd, EVIOCSCLOCKID, &clk); - if (-1 == ret) + if (ret < 0) printf("[EVDEV_TEST16]: test passed\n"); else printf("[EVDEV_TEST16]: test failed\n"); @@ -316,7 +316,7 @@ para_test: /*Start generate event*/ ret = system("echo 1 > /sys/juice_input/run"); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Enable generating input event failed"); goto finish; } @@ -341,7 +341,7 @@ para_test: /*Stop generate input event*/ ret = system("echo 0 > /sys/juice_input/run"); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Disable generating input event failed"); goto finish; } @@ -363,7 +363,7 @@ para_test: printf("[EVDEV_TEST21]: test passed\n"); ret = system("echo 1 > /sys/juice_input/run"); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Enable generating input event failed"); goto finish; } @@ -388,7 +388,7 @@ para_test: /*Stop generate input event*/ ret = system("echo 0 > /sys/juice_input/run"); - if (-1 == ret) { + if (ret < 0) { JUICE_ERROR("Disable generating input event failed"); goto finish; } -- cgit v1.2.3