diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | daemon/gvfsbackendsftp.c | 7 | ||||
| -rw-r--r-- | daemon/gvfsbackendtrash.c | 7 | ||||
| -rw-r--r-- | gconf/gapplookupgconf.c | 6 | ||||
| -rw-r--r-- | test/benchmark-common.c | 3 |
5 files changed, 21 insertions, 10 deletions
@@ -1,5 +1,13 @@ 2008-02-19 Alexander Larsson <alexl@redhat.com> + * daemon/gvfsbackendsftp.c: + * daemon/gvfsbackendtrash.c: + * gconf/gapplookupgconf.c: + * test/benchmark-common.c: + Some more cleanup. + +2008-02-19 Alexander Larsson <alexl@redhat.com> + * lots of *.c files: Code cleanup from Kjartan: Removes unused code/variables. diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c index cbd4ec18..396cbaaa 100644 --- a/daemon/gvfsbackendsftp.c +++ b/daemon/gvfsbackendsftp.c @@ -1004,7 +1004,6 @@ get_uid_sync (GVfsBackendSftp *backend) GDataInputStream *reply; GFileInfo *info; int type; - guint32 id; command = new_command_stream (backend, SSH_FXP_STAT, NULL); put_string (command, "."); @@ -1015,7 +1014,7 @@ get_uid_sync (GVfsBackendSftp *backend) return FALSE; type = g_data_input_stream_read_byte (reply, NULL, NULL); - id = g_data_input_stream_read_uint32 (reply, NULL, NULL); + /*id =*/ (void) g_data_input_stream_read_uint32 (reply, NULL, NULL); /* On error, set uid to -1 and ignore */ backend->my_uid = (guint32)-1; @@ -2712,7 +2711,6 @@ read_dir_readlink_reply (GVfsBackendSftp *backend, gpointer user_data) { ReadDirData *data; - guint32 count; GFileInfo *info = user_data; char *target; @@ -2720,7 +2718,8 @@ read_dir_readlink_reply (GVfsBackendSftp *backend, if (reply_type == SSH_FXP_NAME) { - count = g_data_input_stream_read_uint32 (reply, NULL, NULL); + /* count = */ (void) g_data_input_stream_read_uint32 (reply, NULL, NULL); + target = read_string (reply, NULL); if (target) { diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c index 6a26f52e..10e883a6 100644 --- a/daemon/gvfsbackendtrash.c +++ b/daemon/gvfsbackendtrash.c @@ -201,8 +201,9 @@ unescape_pathname (const char *escaped_dir, int len) { char *trashname; trashname = g_strndup (escaped_dir + 1, len - 1); - return g_build_filename (g_get_user_data_dir (), "Trash", trashname, NULL); + dir = g_build_filename (g_get_user_data_dir (), "Trash", trashname, NULL); g_free (trashname); + return dir; } dir = g_malloc (len + 1 + 1); @@ -553,7 +554,7 @@ list_trash_dirs (void) if (info & HAS_SYSTEM_DIR) { - basename = g_strdup_printf ("%d", getuid()); + basename = g_strdup_printf ("%u", getuid()); trashdir = g_build_filename (topdir, ".Trash", basename, NULL); g_free (basename); dirs = g_list_prepend (dirs, trashdir); @@ -561,7 +562,7 @@ list_trash_dirs (void) if (info & HAS_USER_DIR) { - basename = g_strdup_printf (".Trash-%d", getuid()); + basename = g_strdup_printf (".Trash-%u", getuid()); trashdir = g_build_filename (topdir, basename, NULL); g_free (basename); dirs = g_list_prepend (dirs, trashdir); diff --git a/gconf/gapplookupgconf.c b/gconf/gapplookupgconf.c index 5d562b5d..0a361426 100644 --- a/gconf/gapplookupgconf.c +++ b/gconf/gapplookupgconf.c @@ -147,10 +147,10 @@ get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup, if (enabled) { - if (g_str_has_suffix (command, "\"\%s\"") || - g_str_has_suffix (command, "\'\%s\'")) + if (g_str_has_suffix (command, "\"%s\"") || + g_str_has_suffix (command, "\'%s\'")) command[strlen (command) - 4] = 0; - else if (g_str_has_suffix (command, "\%s")) + else if (g_str_has_suffix (command, "%s")) command[strlen (command) - 2] = 0; flags = G_APP_INFO_CREATE_SUPPORTS_URIS; diff --git a/test/benchmark-common.c b/test/benchmark-common.c index 0c21455b..a704f35c 100644 --- a/test/benchmark-common.c +++ b/test/benchmark-common.c @@ -67,6 +67,7 @@ static gint benchmark_run (gint argc, gchar *argv []); GList *benchmark_data_plots = NULL; gboolean benchmark_is_running = FALSE; +#if 0 static void benchmark_begin_data_plot (const gchar *name, const gchar *x_unit, const gchar *y_unit) { @@ -123,6 +124,8 @@ benchmark_add_data_point (gdouble x, gdouble y) g_array_append_val (data_set->points, data_point); } +#endif + static void benchmark_end (void) { |