From 3f3f652535c156eb486b69c2d5f05e64d259389d Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 9 Jan 2014 08:53:07 +0100 Subject: [PATCH] examples: do not do void* arithmetics in evas examples. Signed-off-by: Cedric BAIL --- src/examples/evas/evas-hints.c | 20 ++++++++++---------- src/examples/evas/evas-text.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c index fb11421f24..39deefca14 100644 --- a/src/examples/evas/evas-hints.c +++ b/src/examples/evas/evas-hints.c @@ -181,8 +181,8 @@ _on_keydown(void *data EINA_UNUSED, { (r_data->align_ptr)++; - if ((unsigned) - (((void *)(r_data->align_ptr)) - ((void *)(r_data->align))) >= + if ((unsigned int) + (((unsigned char *)(r_data->align_ptr)) - ((unsigned char *)(r_data->align))) >= sizeof(r_data->align)) r_data->align_ptr = r_data->align; @@ -198,8 +198,8 @@ _on_keydown(void *data EINA_UNUSED, { (r_data->min_ptr)++; - if ((unsigned) - (((void *)(r_data->min_ptr)) - ((void *)(r_data->min))) >= + if ((unsigned int) + (((unsigned char *)(r_data->min_ptr)) - ((unsigned char *)(r_data->min))) >= sizeof(r_data->min)) r_data->min_ptr = r_data->min; @@ -215,8 +215,8 @@ _on_keydown(void *data EINA_UNUSED, { (r_data->max_ptr)++; - if ((unsigned) - (((void *)(r_data->max_ptr)) - ((void *)(r_data->max))) >= + if ((unsigned int) + (((unsigned char *)(r_data->max_ptr)) - ((unsigned char *)(r_data->max))) >= sizeof(r_data->max)) r_data->max_ptr = r_data->max; @@ -232,8 +232,8 @@ _on_keydown(void *data EINA_UNUSED, { (r_data->padding_ptr)++; - if ((unsigned) - (((void *)(r_data->padding_ptr)) - ((void *)(r_data->padding))) >= + if ((unsigned int) + (((unsigned char *)(r_data->padding_ptr)) - ((unsigned char *)(r_data->padding))) >= sizeof(r_data->padding)) r_data->padding_ptr = r_data->padding; @@ -255,8 +255,8 @@ _on_keydown(void *data EINA_UNUSED, { (r_data->weight_ptr)++; - if ((unsigned) - (((void *)(r_data->weight_ptr)) - ((void *)(r_data->weight))) >= + if ((unsigned int) + (((unsigned char *)(r_data->weight_ptr)) - ((unsigned char *)(r_data->weight))) >= sizeof(r_data->weight)) r_data->weight_ptr = r_data->weight; diff --git a/src/examples/evas/evas-text.c b/src/examples/evas/evas-text.c index b24ac14e7f..d2adc64433 100644 --- a/src/examples/evas/evas-text.c +++ b/src/examples/evas/evas-text.c @@ -33,7 +33,7 @@ #define POINTER_CYCLE(_ptr, _array) \ do \ { \ - if ((unsigned)(((void *)(_ptr)) - ((void *)(_array))) >= \ + if ((unsigned int)(((unsigned char *)(_ptr)) - ((unsigned char *)(_array))) >= \ sizeof(_array)) \ _ptr = _array; \ } \