[gtk/wip/baedert/icontheme2] icontheme: Optimize suffix_from_name
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/icontheme2] icontheme: Optimize suffix_from_name
- Date: Sun, 1 Sep 2019 08:23:03 +0000 (UTC)
commit 8d798c78fe481e3a1c222e9aec75b052226ea276
Author: Timm Bäder <mail baedert org>
Date: Sun Sep 1 10:20:00 2019 +0200
icontheme: Optimize suffix_from_name
We call this function a lot, so avoid repeated strlen() calls on @name
and the different suffixes.
gtk/gtkicontheme.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 22b2be2dcb..9ad5e44a39 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2680,24 +2680,30 @@ string_from_suffix (IconSuffix suffix)
}
}
-static IconSuffix
+static inline IconSuffix
suffix_from_name (const gchar *name)
{
- IconSuffix retval = ICON_SUFFIX_NONE;
+ const gsize name_len = strlen (name);
- if (name != NULL)
+ if (name_len > 4)
{
- if (g_str_has_suffix (name, ".symbolic.png"))
- retval = ICON_SUFFIX_SYMBOLIC_PNG;
- else if (g_str_has_suffix (name, ".png"))
- retval = ICON_SUFFIX_PNG;
- else if (g_str_has_suffix (name, ".svg"))
- retval = ICON_SUFFIX_SVG;
- else if (g_str_has_suffix (name, ".xpm"))
- retval = ICON_SUFFIX_XPM;
+ if (name_len > strlen (".symbolic.png"))
+ {
+ if (strcmp (name + name_len - strlen (".symbolic.png"), ".symbolic.png") == 0)
+ return ICON_SUFFIX_SYMBOLIC_PNG;
+ }
+
+ if (strcmp (name + name_len - strlen (".png"), ".png") == 0)
+ return ICON_SUFFIX_PNG;
+
+ if (strcmp (name + name_len - strlen (".svg"), ".svg") == 0)
+ return ICON_SUFFIX_SVG;
+
+ if (strcmp (name + name_len - strlen (".xpm"), ".xpm") == 0)
+ return ICON_SUFFIX_XPM;
}
- return retval;
+ return ICON_SUFFIX_NONE;
}
static IconSuffix
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]