diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-02-12 15:56:17 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-02-12 16:25:35 +0900 |
| commit | f91086be7d1e33c13789df7c9acdb37638a4f8a1 (patch) | |
| tree | 0fd205ee6d42d7717602a168d3f54d4c60fb9c16 | |
| parent | 7b0891a743ed0b6e14b6059468a4c00322411fb0 (diff) | |
| download | enlightenment-f91086be7d1e33c13789df7c9acdb37638a4f8a1.tar.gz | |
evry module - fix warning about comparing signed to unsigned
harmless warning - use a cast to keepit quiet.
| -rw-r--r-- | src/bin/e_comp_cfdata.h | 20 | ||||
| -rw-r--r-- | src/modules/everything/evry_util.c | 16 |
2 files changed, 22 insertions, 14 deletions
diff --git a/src/bin/e_comp_cfdata.h b/src/bin/e_comp_cfdata.h index da727182fd..00adef6c23 100644 --- a/src/bin/e_comp_cfdata.h +++ b/src/bin/e_comp_cfdata.h @@ -65,16 +65,16 @@ struct _E_Comp_Match const char *visibility_effect; // effect to use when showing and hiding int primary_type; // Ecore_X_Window_Type - used for borders, overrides, first one found - ECORE_X_WINDOW_TYPE_UNKNOWN if not to be used - char borderless; // used for borders, 0 == dont use, 1 == borderless, -1 == not borderless - char dialog; // used for borders, 0 == don't use, 1 == dialog, -1 == not dialog - char accepts_focus; // used for borders, 0 == don't use, 1 == accepts focus, -1 == does not accept focus - char vkbd; // used for borders, 0 == don't use, 1 == is vkbd, -1 == not vkbd - char argb; // used for borders, overrides, popups, menus, 0 == don't use, 1 == is argb, -1 == not argb - char fullscreen; // used for borders, 0 == don't use, 1 == is fullscreen, -1 == not fullscreen - char modal; // used for borders, 0 == don't use, 1 == is modal, -1 == not modal - char focus; // used for setting focus state (on popups): 1 is focused, unset is use regular logic - char urgent; // used for setting urgent state (on popups): 1 is urgent, unset is use regular logic - char no_shadow; // set whether shadow is disabled + signed char borderless; // used for borders, 0 == dont use, 1 == borderless, -1 == not borderless + signed char dialog; // used for borders, 0 == don't use, 1 == dialog, -1 == not dialog + signed char accepts_focus; // used for borders, 0 == don't use, 1 == accepts focus, -1 == does not accept focus + signed char vkbd; // used for borders, 0 == don't use, 1 == is vkbd, -1 == not vkbd + signed char argb; // used for borders, overrides, popups, menus, 0 == don't use, 1 == is argb, -1 == not argb + signed char fullscreen; // used for borders, 0 == don't use, 1 == is fullscreen, -1 == not fullscreen + signed char modal; // used for borders, 0 == don't use, 1 == is modal, -1 == not modal + signed char focus; // used for setting focus state (on popups): 1 is focused, unset is use regular logic + signed char urgent; // used for setting urgent state (on popups): 1 is urgent, unset is use regular logic + signed char no_shadow; // set whether shadow is disabled }; E_API void e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd); diff --git a/src/modules/everything/evry_util.c b/src/modules/everything/evry_util.c index 33b59c39e8..6c8c1178b3 100644 --- a/src/modules/everything/evry_util.c +++ b/src/modules/everything/evry_util.c @@ -199,11 +199,19 @@ evry_fuzzy_match(const char *str, const char *match) { ii = 0; /* go to next word */ - for (; (p[0] && (s_len - (p - str) >= ii)) && !((isspace(*p) || (ip && ispunct(*p)))); p += ii) - if (!eina_unicode_utf8_next_get(p, &ii)) break; + for (; (p[0] && (s_len - (p - str) >= (unsigned int)ii)) && + !((isspace(*p) || (ip && ispunct(*p)))); + p += ii) + { + if (!eina_unicode_utf8_next_get(p, &ii)) break; + } ii = 0; - for (; (p[0] && (s_len - (p - str) >= ii)) && ((isspace(*p) || (ip && ispunct(*p)))); p += ii) - if (!eina_unicode_utf8_next_get(p, &ii)) break; + for (; (p[0] && (s_len - (p - str) >= (unsigned int)ii)) && + ((isspace(*p) || (ip && ispunct(*p)))); + p += ii) + { + if (!eina_unicode_utf8_next_get(p, &ii)) break; + } cnt++; next = p; m_cnt = 0; |