diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-13 20:49:36 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-13 20:49:36 +0900 |
commit | 0d05039f3701fc9b4e7c479b21ec21784dac34c5 (patch) | |
tree | 48b4fb3be2ffae6d5ee042620ca078bf1c486ac4 | |
parent | f6ef5c229fbdf986744ccb7830bff6fcdd024dcd (diff) | |
download | efl-0d05039f3701fc9b4e7c479b21ec21784dac34c5.tar.gz |
evas key bitshifts for 64bit type - fix.
coverity is right. this is another set of thse bitshift problems with
unsigned long long. fix 1224346, 1224345, 1224344 1224343 and 1224342
-rw-r--r-- | src/lib/evas/canvas/evas_key.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/evas/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c index 68c455dc6f..82472aad62 100644 --- a/src/lib/evas/canvas/evas_key.c +++ b/src/lib/evas/canvas/evas_key.c @@ -151,7 +151,7 @@ _evas_canvas_key_modifier_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const ch n = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname); if (n < 0 || n > 63) return; - num = 1 << n; + num = 1ULL << n; e->modifiers.mask |= num; } @@ -163,7 +163,7 @@ _evas_canvas_key_modifier_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const c n = evas_key_modifier_number(&(e->modifiers), keyname); if (n < 0 || n > 63) return; - num = 1 << n; + num = 1ULL << n; e->modifiers.mask &= ~num; } @@ -175,7 +175,7 @@ _evas_canvas_key_lock_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char * n = evas_key_lock_number(&(e->locks), keyname); if (n < 0 || n > 63) return; - num = 1 << n; + num = 1ULL << n; e->locks.mask |= num; } @@ -187,7 +187,7 @@ _evas_canvas_key_lock_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char n = evas_key_lock_number(&(e->locks), keyname); if (n < 0 || n > 63) return; - num = 1 << n; + num = 1ULL << n; e->locks.mask &= ~num; } @@ -196,14 +196,11 @@ _evas_canvas_key_lock_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char EOLIAN Evas_Modifier_Mask _evas_canvas_key_modifier_mask_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { - - Evas_Modifier_Mask num; int n; if (!keyname) return 0; n = evas_key_modifier_number(&(e->modifiers), keyname); if (n < 0 || n > 63) return 0; - num = (Evas_Modifier_Mask)n; - return 1 << num; + return 1ULL << n; } |