[PATCH] Do not use 'namespace' as parameter in header
- From: Marko Anastasov <marko marko anastasov name>
- To: gnome-vfs-list gnome org
- Subject: [PATCH] Do not use 'namespace' as parameter in header
- Date: Tue, 13 Nov 2007 00:44:22 +0100
Hi,
I'm sending a patch that renames a parameter in
g_file_attribute_matcher_enumerate_namespace
to avoid clash with the C++ keyword.
Marko
Index: ChangeLog
===================================================================
--- ChangeLog (revision 736)
+++ ChangeLog (working copy)
@@ -1,5 +1,11 @@
2007-11-13 Marko Anastasov <marko marko anastasov name>
+ * gio/gio/gfileinfo.[ch]: Use a different parameter name instead of
+ 'namespace' for in g_file_attribute_matcher_enumerate_namespace()
+ to avoid clash with the C++ keyword.
+
+2007-11-13 Marko Anastasov <marko marko anastasov name>
+
* gio/glocalfileinfo.c: Build fix, added missing semicolon
to an ifdef'ed call to getpwuid() in lookup_uid_data().
Index: gio/gfileinfo.c
===================================================================
--- gio/gfileinfo.c (revision 735)
+++ gio/gfileinfo.c (working copy)
@@ -1838,25 +1838,25 @@
/**
* g_file_attribute_matcher_enumerate_namespace:
* @matcher: a #GFileAttributeMatcher.
- * @namespace:
+ * @ns:
*
* Returns: %TRUE, %FALSE.
**/
gboolean
g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
- const char *namespace)
+ const char *ns)
{
SubMatcher *sub_matchers;
int ns_id;
int i;
g_return_val_if_fail (matcher != NULL, FALSE);
- g_return_val_if_fail (namespace != NULL && *namespace != '\0', FALSE);
+ g_return_val_if_fail (ns != NULL && *ns != '\0', FALSE);
if (matcher->all)
return TRUE;
- ns_id = lookup_namespace (namespace) << NS_POS;
+ ns_id = lookup_namespace (ns) << NS_POS;
for (i = 0; i < ON_STACK_MATCHERS; i++)
{
Index: gio/gfileinfo.h
===================================================================
--- gio/gfileinfo.h (revision 735)
+++ gio/gfileinfo.h (working copy)
@@ -270,7 +270,7 @@
gboolean g_file_attribute_matcher_matches_only (GFileAttributeMatcher *matcher,
const char *attribute);
gboolean g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
- const char *namespace);
+ const char *ns);
const char * g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]