Replace strncmp code

the structure "!strcmp(X, "foo", strlen("foo"))" is equal to
"eina_has_prefix(X, "foo")", and the later is nicer to read, hence this
replaces it.

Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D11620

diff --git a/src/lib/eina/eina_abstract_content.c b/src/lib/eina/eina_abstract_content.c
index a9899ce..7f54122 100644 (file)
--- a/src/lib/eina/eina_abstract_content.c
+++ b/src/lib/eina/eina_abstract_content.c
@@ -120,7 +120,7 @@ eina_content_new(Eina_Slice data, const char *type)
 {
    Eina_Content *content;
 
-   if (!strncmp(type, "text", strlen("text")))
+   if (eina_str_has_prefix(type,"text"))
      {
         //last char in the mem must be \0
         if (((char*)data.mem)[data.len - 1] != '\0')

diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index f972b59..5427a35 100644 (file)
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -771,7 +771,7 @@ _elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
 
    if (sd->list)
      {
-        if (!strncmp(elm_object_style_get(obj), "default", strlen("default")))
+        if (eina_str_has_prefix(elm_object_style_get(obj),"default"))
           elm_object_style_set(sd->list, "ctxpopup");
         else
           elm_object_style_set(sd->list, elm_object_style_get(obj));
@@ -1660,7 +1660,7 @@ _elm_ctxpopup_item_init(Eo *eo_item,
    if (!sd->list)
      {
         sd->list = elm_list_add(obj);
-        if (!strncmp(elm_object_style_get(obj), "default", strlen("default")))
+        if (eina_str_has_prefix(elm_object_style_get(obj),"default"))
           elm_object_style_set(sd->list, "ctxpopup");
         else elm_object_style_set(sd->list, elm_object_style_get(obj));
         elm_list_mode_set(sd->list, ELM_LIST_EXPAND);

diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index 41528ab..e6eda76 100644 (file)
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -518,7 +518,7 @@ _ecore_evas_cocoa_selection_request(Ecore_Evas *ee EINA_UNUSED, unsigned int sea
         Eina_Rw_Slice slice;
 
         data = ecore_cocoa_clipboard_get(&size, mime_type);
-        if (!strncmp(mime_type, "text", strlen("text")))
+        if (eina_str_has_prefix(mime_type,"text"))
           {
              //ensure that we always have a \0 at the end, there is no assertion that \0 is included here.
              slice.len = size + 1;

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index d250e2b..7d4efb0 100644 (file)
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -3626,7 +3626,7 @@ _wl_selection_receive(void *data, int type EINA_UNUSED, void *event)
    //Now deliver the content
    Eina_Slice slice;
 
-   if (!strncmp(ready->mimetype, "text", strlen("text")))
+   if (eina_str_has_prefix(ready->mimetype,"text"))
      {
         //ensure that we always have a \0 at the end, there is no assertion that \0 is included here.
         slice.len = ready->len + 1;

diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 2c1603e..6ce36fe 100644 (file)
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -3854,7 +3854,7 @@ _deliver_content(Ecore_Evas *ee, Ecore_Evas_Engine_Data_X11 *edata, Ecore_Evas_S
    Eina_Content *result = NULL;
    Eina_Stringshare *mime_type = _decrypt_type(edata->selection_data[selection].requested_type);
 
-   if (!strncmp(mime_type, "text", strlen("text")))
+   if (eina_str_has_prefix(mime_type,"text"))
      {
         //ensure that we always have a \0 at the end, there is no assertion that \0 is included here.
         void *null_terminated = eina_memdup(x11_data->data, x11_data->length, EINA_TRUE);
@@ -3862,7 +3862,7 @@ _deliver_content(Ecore_Evas *ee, Ecore_Evas_Engine_Data_X11 *edata, Ecore_Evas_S
         result = _create_deliveriy_content(x11_data->length + 1, null_terminated, mime_type);
         free(null_terminated);
      }
-   else if (!strncmp(mime_type, "image", strlen("image")))
+   else if (eina_str_has_prefix(mime_type,"image"))
      {
         Eina_Content *tmp_container = eina_content_new((Eina_Slice){.len = x11_data->length, .mem = x11_data->data}, mime_type);
         const char *file = eina_content_as_file(tmp_container);

diff --git a/src/tests/elementary/efl_ui_window_cnp_dnd_slave.c b/src/tests/elementary/efl_ui_window_cnp_dnd_slave.c
index bf8c6d5..43aafa5 100644 (file)
--- a/src/tests/elementary/efl_ui_window_cnp_dnd_slave.c
+++ b/src/tests/elementary/efl_ui_window_cnp_dnd_slave.c
@@ -22,7 +22,7 @@ _deliverty_cb(void *data, const Eina_Value value, const Eina_Future *dead_future
 
    content = eina_value_to_content(&value);
    printf("Got Content of selection %d with type %s\n", buffer, eina_content_type_get(content));
-   if (!strncmp(eina_content_type_get(content), "text", strlen("text")))
+   if (eina_str_has_prefix(eina_content_type_get(content),"text"))
      {
         printf("Content: %s\n", (char*)eina_content_data_get(content).mem);
      }