[gnome-software] gs-appstream: Add missing consts
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] gs-appstream: Add missing consts
- Date: Tue, 9 Jul 2019 06:46:43 +0000 (UTC)
commit 7395fc9015f5a7121ca276e52fbb85f8bbca8c56
Author: Philip Withnall <withnall endlessm com>
Date: Mon Jul 8 19:59:29 2019 +0100
gs-appstream: Add missing consts
This doesn’t change the behaviour of the code, but does mean more stuff
is correctly read-only in memory.
Unfortunately we can’t change the prototype of gs_plugin_add_search() to
take `const gchar * const *values`, but that’s effectively what we want
to do. Doing so would be a break in the plugin API (but not the ABI), in
the sense that it would cause warnings which weren’t present before in
third party plugins.
Signed-off-by: Philip Withnall <withnall endlessm com>
plugins/core/gs-appstream.c | 6 +++---
plugins/core/gs-appstream.h | 2 +-
plugins/core/gs-plugin-appstream.c | 2 +-
plugins/flatpak/gs-flatpak.c | 2 +-
plugins/flatpak/gs-flatpak.h | 2 +-
plugins/flatpak/gs-plugin-flatpak.c | 2 +-
plugins/shell-extensions/gs-plugin-shell-extensions.c | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/plugins/core/gs-appstream.c b/plugins/core/gs-appstream.c
index b6f60f9c..23d966ff 100644
--- a/plugins/core/gs-appstream.c
+++ b/plugins/core/gs-appstream.c
@@ -1010,7 +1010,7 @@ gs_appstream_silo_search_component2 (GPtrArray *array, XbNode *component, const
}
static guint16
-gs_appstream_silo_search_component (GPtrArray *array, XbNode *component, gchar **search)
+gs_appstream_silo_search_component (GPtrArray *array, XbNode *component, const gchar * const *search)
{
guint16 matches_sum = 0;
@@ -1027,7 +1027,7 @@ gs_appstream_silo_search_component (GPtrArray *array, XbNode *component, gchar *
gboolean
gs_appstream_search (GsPlugin *plugin,
XbSilo *silo,
- gchar **values,
+ const gchar * const *values,
GsAppList *list,
GCancellable *cancellable,
GError **error)
@@ -1036,7 +1036,7 @@ gs_appstream_search (GsPlugin *plugin,
g_autoptr(GPtrArray) array = g_ptr_array_new_with_free_func ((GDestroyNotify)
gs_appstream_search_helper_free);
g_autoptr(GPtrArray) components = NULL;
g_autoptr(GTimer) timer = g_timer_new ();
- struct {
+ const struct {
AsAppSearchMatch match_value;
const gchar *xpath;
} queries[] = {
diff --git a/plugins/core/gs-appstream.h b/plugins/core/gs-appstream.h
index aa0066d2..330651c4 100644
--- a/plugins/core/gs-appstream.h
+++ b/plugins/core/gs-appstream.h
@@ -24,7 +24,7 @@ gboolean gs_appstream_refine_app (GsPlugin *plugin,
GError **error);
gboolean gs_appstream_search (GsPlugin *plugin,
XbSilo *silo,
- gchar **values,
+ const gchar * const *values,
GsAppList *list,
GCancellable *cancellable,
GError **error);
diff --git a/plugins/core/gs-plugin-appstream.c b/plugins/core/gs-plugin-appstream.c
index 4d36a032..6624e5ba 100644
--- a/plugins/core/gs-plugin-appstream.c
+++ b/plugins/core/gs-plugin-appstream.c
@@ -920,7 +920,7 @@ gs_plugin_add_search (GsPlugin *plugin,
locker = g_rw_lock_reader_locker_new (&priv->silo_lock);
return gs_appstream_search (plugin,
priv->silo,
- values,
+ (const gchar * const *) values,
list,
cancellable,
error);
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index e01e70f5..0ab70e8a 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -2704,7 +2704,7 @@ gs_flatpak_file_to_app_ref (GsFlatpak *self,
gboolean
gs_flatpak_search (GsFlatpak *self,
- gchar **values,
+ const gchar * const *values,
GsAppList *list,
GCancellable *cancellable,
GError **error)
diff --git a/plugins/flatpak/gs-flatpak.h b/plugins/flatpak/gs-flatpak.h
index 139d28f5..97e19bd9 100644
--- a/plugins/flatpak/gs-flatpak.h
+++ b/plugins/flatpak/gs-flatpak.h
@@ -92,7 +92,7 @@ GsApp *gs_flatpak_find_source_by_url (GsFlatpak *self,
GCancellable *cancellable,
GError **error);
gboolean gs_flatpak_search (GsFlatpak *self,
- gchar **values,
+ const gchar * const *values,
GsAppList *list,
GCancellable *cancellable,
GError **error);
diff --git a/plugins/flatpak/gs-plugin-flatpak.c b/plugins/flatpak/gs-plugin-flatpak.c
index ee35be4b..0da2f5fb 100644
--- a/plugins/flatpak/gs-plugin-flatpak.c
+++ b/plugins/flatpak/gs-plugin-flatpak.c
@@ -937,7 +937,7 @@ gs_plugin_add_search (GsPlugin *plugin,
GsPluginData *priv = gs_plugin_get_data (plugin);
for (guint i = 0; i < priv->flatpaks->len; i++) {
GsFlatpak *flatpak = g_ptr_array_index (priv->flatpaks, i);
- if (!gs_flatpak_search (flatpak, values, list,
+ if (!gs_flatpak_search (flatpak, (const gchar * const *) values, list,
cancellable, error)) {
return FALSE;
}
diff --git a/plugins/shell-extensions/gs-plugin-shell-extensions.c
b/plugins/shell-extensions/gs-plugin-shell-extensions.c
index 2b6411ba..c5861bf9 100644
--- a/plugins/shell-extensions/gs-plugin-shell-extensions.c
+++ b/plugins/shell-extensions/gs-plugin-shell-extensions.c
@@ -913,7 +913,7 @@ gs_plugin_add_search (GsPlugin *plugin, gchar **values, GsAppList *list,
if (!_check_silo (plugin, cancellable, error))
return FALSE;
locker = g_rw_lock_reader_locker_new (&priv->silo_lock);
- if (!gs_appstream_search (plugin, priv->silo, values, list_tmp,
+ if (!gs_appstream_search (plugin, priv->silo, (const gchar * const *) values, list_tmp,
cancellable, error))
return FALSE;
_claim_components (plugin, list_tmp);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]