Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 1e48821ba109b00e9c2931f12aa206c4ef54fd71 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 24 Apr 2017 12:34:55 -0700 |
| 4 | Subject: [PATCH] libgeis: Compare the first character of string to null |
| 5 | |
| 6 | gcc7 wants to be specific when it comes to comparing characters |
| 7 | and strings |
| 8 | |
| 9 | fixes |
| 10 | |
| 11 | | ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c: In function '_v1_subscribe_device': |
| 12 | | ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c:613:20: error: comparison between pointer and zero character constant [-Werror=pointer-compare] |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | libgeis/geis_v1.c | 4 ++-- |
| 17 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 18 | |
| 19 | diff --git a/libgeis/geis_v1.c b/libgeis/geis_v1.c |
| 20 | index 67045ee..07c0851 100644 |
| 21 | --- a/libgeis/geis_v1.c |
| 22 | +++ b/libgeis/geis_v1.c |
| 23 | @@ -610,7 +610,7 @@ _v1_subscribe_device(GeisInstance instance, |
| 24 | const char **gesture_list) |
| 25 | { |
| 26 | GeisStatus result = GEIS_UNKNOWN_ERROR; |
| 27 | - if (gesture_list == GEIS_ALL_GESTURES) |
| 28 | + if (gesture_list[0][0] == GEIS_ALL_GESTURES) |
| 29 | { |
| 30 | geis_debug("subscribing device %d for all gestures", device_id); |
| 31 | } |
| 32 | @@ -757,7 +757,7 @@ geis_unsubscribe(GeisInstance instance, |
| 33 | GeisGestureType *gesture_list) |
| 34 | { |
| 35 | GeisStatus status = GEIS_STATUS_NOT_SUPPORTED; |
| 36 | - if (gesture_list == GEIS_ALL_GESTURES) |
| 37 | + if (gesture_list[0] == GEIS_ALL_GESTURES) |
| 38 | { |
| 39 | status = geis_subscription_deactivate(instance->subscription); |
| 40 | } |
| 41 | -- |
| 42 | 2.12.2 |
| 43 | |