summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-02-12 15:56:17 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-02-12 16:25:35 +0900
commitf91086be7d1e33c13789df7c9acdb37638a4f8a1 (patch)
tree0fd205ee6d42d7717602a168d3f54d4c60fb9c16
parent7b0891a743ed0b6e14b6059468a4c00322411fb0 (diff)
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.h20
-rw-r--r--src/modules/everything/evry_util.c16
2 files changed, 22 insertions, 14 deletions
diff --git a/src/bin/e_comp_cfdata.h b/src/bin/e_comp_cfdata.h
index da727182f..00adef6c2 100644
--- a/src/bin/e_comp_cfdata.h
+++ b/src/bin/e_comp_cfdata.h
@@ -65,16 +65,16 @@ struct _E_Comp_Match
65 const char *visibility_effect; // effect to use when showing and hiding 65 const char *visibility_effect; // effect to use when showing and hiding
66 66
67 int primary_type; // Ecore_X_Window_Type - used for borders, overrides, first one found - ECORE_X_WINDOW_TYPE_UNKNOWN if not to be used 67 int primary_type; // Ecore_X_Window_Type - used for borders, overrides, first one found - ECORE_X_WINDOW_TYPE_UNKNOWN if not to be used
68 char borderless; // used for borders, 0 == dont use, 1 == borderless, -1 == not borderless 68 signed char borderless; // used for borders, 0 == dont use, 1 == borderless, -1 == not borderless
69 char dialog; // used for borders, 0 == don't use, 1 == dialog, -1 == not dialog 69 signed char dialog; // used for borders, 0 == don't use, 1 == dialog, -1 == not dialog
70 char accepts_focus; // used for borders, 0 == don't use, 1 == accepts focus, -1 == does not accept focus 70 signed char accepts_focus; // used for borders, 0 == don't use, 1 == accepts focus, -1 == does not accept focus
71 char vkbd; // used for borders, 0 == don't use, 1 == is vkbd, -1 == not vkbd 71 signed char vkbd; // used for borders, 0 == don't use, 1 == is vkbd, -1 == not vkbd
72 char argb; // used for borders, overrides, popups, menus, 0 == don't use, 1 == is argb, -1 == not argb 72 signed char argb; // used for borders, overrides, popups, menus, 0 == don't use, 1 == is argb, -1 == not argb
73 char fullscreen; // used for borders, 0 == don't use, 1 == is fullscreen, -1 == not fullscreen 73 signed char fullscreen; // used for borders, 0 == don't use, 1 == is fullscreen, -1 == not fullscreen
74 char modal; // used for borders, 0 == don't use, 1 == is modal, -1 == not modal 74 signed char modal; // used for borders, 0 == don't use, 1 == is modal, -1 == not modal
75 char focus; // used for setting focus state (on popups): 1 is focused, unset is use regular logic 75 signed char focus; // used for setting focus state (on popups): 1 is focused, unset is use regular logic
76 char urgent; // used for setting urgent state (on popups): 1 is urgent, unset is use regular logic 76 signed char urgent; // used for setting urgent state (on popups): 1 is urgent, unset is use regular logic
77 char no_shadow; // set whether shadow is disabled 77 signed char no_shadow; // set whether shadow is disabled
78}; 78};
79 79
80E_API void e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd); 80E_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 33b59c39e..6c8c1178b 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)
199 { 199 {
200 ii = 0; 200 ii = 0;
201 /* go to next word */ 201 /* go to next word */
202 for (; (p[0] && (s_len - (p - str) >= ii)) && !((isspace(*p) || (ip && ispunct(*p)))); p += ii) 202 for (; (p[0] && (s_len - (p - str) >= (unsigned int)ii)) &&
203 if (!eina_unicode_utf8_next_get(p, &ii)) break; 203 !((isspace(*p) || (ip && ispunct(*p))));
204 p += ii)
205 {
206 if (!eina_unicode_utf8_next_get(p, &ii)) break;
207 }
204 ii = 0; 208 ii = 0;
205 for (; (p[0] && (s_len - (p - str) >= ii)) && ((isspace(*p) || (ip && ispunct(*p)))); p += ii) 209 for (; (p[0] && (s_len - (p - str) >= (unsigned int)ii)) &&
206 if (!eina_unicode_utf8_next_get(p, &ii)) break; 210 ((isspace(*p) || (ip && ispunct(*p))));
211 p += ii)
212 {
213 if (!eina_unicode_utf8_next_get(p, &ii)) break;
214 }
207 cnt++; 215 cnt++;
208 next = p; 216 next = p;
209 m_cnt = 0; 217 m_cnt = 0;