summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2018-08-12 00:07:11 +0200
committerCarlos Garnacho <carlosg@gnome.org>2018-08-15 22:54:32 +0200
commit65cad5c970c7074bf3d6280a35ecd0d5afa9a7e7 (patch)
treec7fb8f4bd29730ca8ecd4749ec97272163d95e3e
parentb7b6aea598ce18002fadbe3f8c2ef2db1fd5ad24 (diff)
downloadtracker-65cad5c970c7074bf3d6280a35ecd0d5afa9a7e7.tar.gz
libtracker-sparql: Don't use 'namespace' as a parameter name
This header was unusable from C++ code as 'namespace' is a reserved keyword there. Based on a patch by Santtu Lakkala from https://bugzilla.gnome.org/show_bug.cgi?id=791510
-rw-r--r--src/libtracker-sparql/tracker-namespace-manager.c14
-rw-r--r--src/libtracker-sparql/tracker-namespace-manager.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libtracker-sparql/tracker-namespace-manager.c b/src/libtracker-sparql/tracker-namespace-manager.c
index 5ce4cfa4d..e24f68749 100644
--- a/src/libtracker-sparql/tracker-namespace-manager.c
+++ b/src/libtracker-sparql/tracker-namespace-manager.c
@@ -211,7 +211,7 @@ tracker_namespace_manager_lookup_prefix (TrackerNamespaceManager *self,
* tracker_namespace_manager_add_prefix:
* @self: a #TrackerNamespaceManager
* @prefix: a short, unique prefix to identify @namespace
- * @namespace: the URL of the given namespace
+ * @ns: the URL of the given namespace
*
* Adds @prefix as the recognised abbreviaton of @namespace.
*
@@ -223,14 +223,14 @@ tracker_namespace_manager_lookup_prefix (TrackerNamespaceManager *self,
void
tracker_namespace_manager_add_prefix (TrackerNamespaceManager *self,
const char *prefix,
- const char *namespace)
+ const char *ns)
{
TrackerNamespaceManagerPrivate *priv;
const char *str;
g_return_if_fail (TRACKER_IS_NAMESPACE_MANAGER (self));
g_return_if_fail (prefix != NULL);
- g_return_if_fail (namespace != NULL);
+ g_return_if_fail (ns != NULL);
priv = GET_PRIVATE (TRACKER_NAMESPACE_MANAGER (self));
@@ -245,14 +245,14 @@ tracker_namespace_manager_add_prefix (TrackerNamespaceManager *self,
return;
}
- str = g_hash_table_lookup (priv->namespace_to_prefix, namespace);
+ str = g_hash_table_lookup (priv->namespace_to_prefix, ns);
if (str) {
- g_error ("Namespace %s already has prefix %s", namespace, str);
+ g_error ("Namespace %s already has prefix %s", ns, str);
return;
}
- g_hash_table_insert (priv->prefix_to_namespace, g_strdup (prefix), g_strdup (namespace));
- g_hash_table_insert (priv->namespace_to_prefix, g_strdup (namespace), g_strdup (prefix));
+ g_hash_table_insert (priv->prefix_to_namespace, g_strdup (prefix), g_strdup (ns));
+ g_hash_table_insert (priv->namespace_to_prefix, g_strdup (ns), g_strdup (prefix));
}
/**
diff --git a/src/libtracker-sparql/tracker-namespace-manager.h b/src/libtracker-sparql/tracker-namespace-manager.h
index 0f539d41a..9de4643f1 100644
--- a/src/libtracker-sparql/tracker-namespace-manager.h
+++ b/src/libtracker-sparql/tracker-namespace-manager.h
@@ -39,7 +39,7 @@ char *tracker_namespace_manager_expand_uri (TrackerNamespaceManager *self, const
gboolean tracker_namespace_manager_has_prefix (TrackerNamespaceManager *self, const char *prefix);
const char *tracker_namespace_manager_lookup_prefix (TrackerNamespaceManager *self, const char *prefix);
-void tracker_namespace_manager_add_prefix (TrackerNamespaceManager *self, const char *prefix, const char *namespace);
+void tracker_namespace_manager_add_prefix (TrackerNamespaceManager *self, const char *prefix, const char *ns);
char *tracker_namespace_manager_print_turtle (TrackerNamespaceManager *self);