summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-03-02 08:34:15 +0000
committerAlexander Larsson <alexl@src.gnome.org>2009-03-02 08:34:15 +0000
commitb31808b6f6818d51bdcb1a81cca9e6c6db9724cd (patch)
tree33c0bd8ec0ce2be7eb15731cd1a51377ba9ae752
parent6165222db64ea2e21e28c6360fb36f94cd37b983 (diff)
downloadgvfs-b31808b6f6818d51bdcb1a81cca9e6c6db9724cd.tar.gz
Remove unused functions. Pointed out by Tommi Rantala.
2009-03-02 Alexander Larsson <alexl@redhat.com> * common/gdbusutils.[ch]: Remove unused functions. Pointed out by Tommi Rantala. svn path=/trunk/; revision=2262
-rw-r--r--ChangeLog5
-rw-r--r--common/gdbusutils.c58
-rw-r--r--common/gdbusutils.h5
3 files changed, 5 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a02ce39..c2a9ff5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-02 Alexander Larsson <alexl@redhat.com>
+
+ * common/gdbusutils.[ch]:
+ Remove unused functions. Pointed out by Tommi Rantala.
+
2009-02-27 Ryan Lortie <desrt@desrt.ca>
* daemon/trashlib/dirwatch.c:
diff --git a/common/gdbusutils.c b/common/gdbusutils.c
index f6dc27af..c3f3f332 100644
--- a/common/gdbusutils.c
+++ b/common/gdbusutils.c
@@ -159,64 +159,6 @@ append_unescaped_dbus_name (GString *s,
}
}
-char *
-_g_dbus_unescape_bus_name (const char *escaped, const char *end)
-{
- GString *s = g_string_new ("");
-
- if (end == NULL)
- end = escaped + strlen (escaped);
-
- append_unescaped_dbus_name (s, escaped, end);
- return g_string_free (s, FALSE);
-}
-
-/* We use _ for escaping */
-#define VALID_INITIAL_BUS_NAME_CHARACTER(c) \
- ( ((c) >= 'A' && (c) <= 'Z') || \
- ((c) >= 'a' && (c) <= 'z') || \
- /*((c) == '_') || */((c) == '-'))
-#define VALID_BUS_NAME_CHARACTER(c) \
- ( ((c) >= '0' && (c) <= '9') || \
- ((c) >= 'A' && (c) <= 'Z') || \
- ((c) >= 'a' && (c) <= 'z') || \
- /*((c) == '_')||*/ ((c) == '-'))
-
-void
-_g_dbus_append_escaped_bus_name (GString *s,
- gboolean at_start,
- const char *unescaped)
-{
- char c;
- gboolean first;
- static const gchar hex[16] = "0123456789ABCDEF";
-
- while ((c = *unescaped++) != 0)
- {
- if (first && at_start)
- {
- if (VALID_INITIAL_BUS_NAME_CHARACTER (c))
- {
- g_string_append_c (s, c);
- continue;
- }
- }
- else
- {
- if (VALID_BUS_NAME_CHARACTER (c))
- {
- g_string_append_c (s, c);
- continue;
- }
- }
-
- first = FALSE;
- g_string_append_c (s, '_');
- g_string_append_c (s, hex[((guchar)c) >> 4]);
- g_string_append_c (s, hex[((guchar)c) & 0xf]);
- }
-}
-
void
_g_dbus_message_iter_append_cstring (DBusMessageIter *iter, const char *str)
{
diff --git a/common/gdbusutils.h b/common/gdbusutils.h
index 00ef566d..1a94330b 100644
--- a/common/gdbusutils.h
+++ b/common/gdbusutils.h
@@ -75,11 +75,6 @@ DBusMessage *_dbus_message_new_gerror (DBusMessage *message,
gint code,
const gchar *format,
...);
-char * _g_dbus_unescape_bus_name (const char *escaped,
- const char *end);
-void _g_dbus_append_escaped_bus_name (GString *string,
- gboolean at_start,
- const char *unescaped);
void _g_dbus_connection_integrate_with_main (DBusConnection *connection);
void _g_dbus_connection_remove_from_main (DBusConnection *connection);
GSource * __g_fd_source_new (int fd,