diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2008-06-10 14:35:39 +0000 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@src.gnome.org> | 2008-06-10 14:35:39 +0000 |
commit | 132e878152fb5d1128061796daba9da57cb60b4b (patch) | |
tree | e8914334346c5fd0304943fc20f89163fc6b1cef /daemon | |
parent | 22db416f787d53e8b23d4cd0b9398f23c02b1378 (diff) | |
download | gvfs-132e878152fb5d1128061796daba9da57cb60b4b.tar.gz |
Fix build warnings with GCC 4.3.0 (#537588).
2008-06-10 Cosimo Cecchi <cosimoc@gnome.org>
* daemon/gvfsbackendarchive.c: (gvfs_archive_pop_job):
* daemon/gvfsbackenddav.c: (stat_location), (write_ready),
(close_write_ready), (do_make_directory), (do_delete):
* daemon/gvfsbackendftp.c:
(ftp_connection_set_error_from_response):
* daemon/gvfsbackendhttp.c: (g_vfs_job_failed_from_http_status),
(open_for_read_ready), (read_ready), (try_seek_on_read),
(close_read_ready):
* daemon/gvfsbackendobexftp.c: (_query_file_info_helper),
(error_occurred_cb), (do_delete):
Fix build warnings with GCC 4.3.0 (#537588).
* daemon/gvfsjob.c: (g_vfs_job_failed), (g_vfs_job_failed_literal):
* daemon/gvfsjob.h:
Add g_vfs_job_failed_literal ().
svn path=/trunk/; revision=1802
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/gvfsbackendarchive.c | 8 | ||||
-rw-r--r-- | daemon/gvfsbackenddav.c | 32 | ||||
-rw-r--r-- | daemon/gvfsbackendftp.c | 2 | ||||
-rw-r--r-- | daemon/gvfsbackendhttp.c | 36 | ||||
-rw-r--r-- | daemon/gvfsbackendobexftp.c | 10 | ||||
-rw-r--r-- | daemon/gvfsjob.c | 21 | ||||
-rw-r--r-- | daemon/gvfsjob.h | 4 |
7 files changed, 63 insertions, 50 deletions
diff --git a/daemon/gvfsbackendarchive.c b/daemon/gvfsbackendarchive.c index 0334d232..71f32365 100644 --- a/daemon/gvfsbackendarchive.c +++ b/daemon/gvfsbackendarchive.c @@ -180,10 +180,10 @@ gvfs_archive_pop_job (GVfsArchive *archive) } else if (archive_errno (archive->archive)) { - g_vfs_job_failed (archive->job, - G_IO_ERROR, - archive_errno (archive->archive), - archive_error_string (archive->archive)); + g_vfs_job_failed_literal (archive->job, + G_IO_ERROR, + archive_errno (archive->archive), + archive_error_string (archive->archive)); } else g_vfs_job_succeeded (archive->job); diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c index 228ceb26..6855cc7b 100644 --- a/daemon/gvfsbackenddav.c +++ b/daemon/gvfsbackenddav.c @@ -1133,7 +1133,7 @@ stat_location (GVfsBackend *backend, g_set_error (error, G_IO_ERROR, http_error_code_from_status (status), - msg->reason_phrase); + "%s", msg->reason_phrase); return FALSE; } @@ -1887,10 +1887,10 @@ write_ready (GObject *source_object, if (nwrote < 0) { - g_vfs_job_failed (G_VFS_JOB (job), - error->domain, - error->code, - error->message); + g_vfs_job_failed_literal (G_VFS_JOB (job), + error->domain, + error->code, + error->message); g_error_free (error); return; @@ -1940,10 +1940,10 @@ close_write_ready (GObject *source_object, &error); if (res == FALSE) { - g_vfs_job_failed (G_VFS_JOB (job), - error->domain, - error->code, - error->message); + g_vfs_job_failed_literal (G_VFS_JOB (job), + error->domain, + error->code, + error->message); g_error_free (error); } @@ -1992,9 +1992,9 @@ do_make_directory (GVfsBackend *backend, G_IO_ERROR_EXISTS, _("Target file already exists")); else - g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, - http_error_code_from_status (status), - msg->reason_phrase); + g_vfs_job_failed_literal (G_VFS_JOB (job), G_IO_ERROR, + http_error_code_from_status (status), + msg->reason_phrase); else g_vfs_job_succeeded (G_VFS_JOB (job)); @@ -2039,10 +2039,10 @@ do_delete (GVfsBackend *backend, status = g_vfs_backend_dav_send_message (backend, msg); if (!SOUP_STATUS_IS_SUCCESSFUL (status)) - g_vfs_job_failed (G_VFS_JOB (job), - G_IO_ERROR, - http_error_code_from_status (status), - msg->reason_phrase); + g_vfs_job_failed_literal (G_VFS_JOB (job), + G_IO_ERROR, + http_error_code_from_status (status), + msg->reason_phrase); else g_vfs_job_succeeded (G_VFS_JOB (job)); diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c index 732a28a2..ea0bfcc3 100644 --- a/daemon/gvfsbackendftp.c +++ b/daemon/gvfsbackendftp.c @@ -288,7 +288,7 @@ ftp_connection_set_error_from_response (FtpConnection *conn, guint response) } DEBUG ("error: %s\n", msg); - g_set_error (&conn->error, G_IO_ERROR, code, msg); + g_set_error (&conn->error, G_IO_ERROR, code, "%s", msg); } /** diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c index b96c493e..7e91a056 100644 --- a/daemon/gvfsbackendhttp.c +++ b/daemon/gvfsbackendhttp.c @@ -230,8 +230,8 @@ g_vfs_job_failed_from_http_status (GVfsJob *job, guint status_code, const char * switch (status_code) { case SOUP_STATUS_NOT_FOUND: - g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - message); + g_vfs_job_failed_literal (job, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, + message); break; case SOUP_STATUS_UNAUTHORIZED: @@ -340,10 +340,10 @@ open_for_read_ready (GObject *source_object, &error); if (res == FALSE) { - g_vfs_job_failed (G_VFS_JOB (job), - error->domain, - error->code, - error->message); + g_vfs_job_failed_literal (G_VFS_JOB (job), + error->domain, + error->code, + error->message); g_error_free (error); return; @@ -401,10 +401,10 @@ read_ready (GObject *source_object, if (nread < 0) { - g_vfs_job_failed (G_VFS_JOB (job), - error->domain, - error->code, - error->message); + g_vfs_job_failed_literal (G_VFS_JOB (job), + error->domain, + error->code, + error->message); g_error_free (error); return; @@ -451,10 +451,10 @@ try_seek_on_read (GVfsBackend *backend, if (!g_seekable_seek (G_SEEKABLE (stream), offset, type, G_VFS_JOB (job)->cancellable, &error)) { - g_vfs_job_failed (G_VFS_JOB (job), - error->domain, - error->code, - error->message); + g_vfs_job_failed_literal (G_VFS_JOB (job), + error->domain, + error->code, + error->message); g_error_free (error); return FALSE; } @@ -485,10 +485,10 @@ close_read_ready (GObject *source_object, &error); if (res == FALSE) { - g_vfs_job_failed (G_VFS_JOB (job), - error->domain, - error->code, - error->message); + g_vfs_job_failed_literal (G_VFS_JOB (job), + error->domain, + error->code, + error->message); g_error_free (error); } diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c index 10530a1e..226ed7bd 100644 --- a/daemon/gvfsbackendobexftp.c +++ b/daemon/gvfsbackendobexftp.c @@ -487,7 +487,7 @@ _query_file_info_helper (GVfsBackend *backend, { g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - g_strerror (ENOENT)); + "%s", g_strerror (ENOENT)); } g_free (basename); @@ -519,9 +519,9 @@ error_occurred_cb (DBusGProxy *proxy, const gchar *error_name, const gchar *erro if (op_backend->doing_io) { op_backend->status = ASYNC_ERROR; - op_backend->error = g_error_new (DBUS_GERROR, - DBUS_GERROR_REMOTE_EXCEPTION, - error_message); + op_backend->error = g_error_new_literal (DBUS_GERROR, + DBUS_GERROR_REMOTE_EXCEPTION, + error_message); g_cond_signal (op_backend->cond); g_mutex_unlock (op_backend->mutex); return; @@ -1309,7 +1309,7 @@ do_delete (GVfsBackend *backend, g_mutex_unlock (op_backend->mutex); g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_EMPTY, - g_strerror (ENOTEMPTY)); + "%s", g_strerror (ENOTEMPTY)); g_vfs_job_failed_from_error (G_VFS_JOB (job), error); g_error_free (error); return; diff --git a/daemon/gvfsjob.c b/daemon/gvfsjob.c index 4261dea7..4f2ae45f 100644 --- a/daemon/gvfsjob.c +++ b/daemon/gvfsjob.c @@ -247,17 +247,26 @@ g_vfs_job_failed (GVfsJob *job, va_list args; char *message; - if (job->failed) - return; - - job->failed = TRUE; - va_start (args, format); message = g_strdup_vprintf (format, args); va_end (args); - job->error = g_error_new (domain, code, message); + g_vfs_job_failed_literal (job, domain, code, message); g_free (message); +} + +void +g_vfs_job_failed_literal (GVfsJob *job, + GQuark domain, + gint code, + const gchar *message) +{ + if (job->failed) + return; + + job->failed = TRUE; + + job->error = g_error_new_literal (domain, code, message); g_vfs_job_send_reply (job); } diff --git a/daemon/gvfsjob.h b/daemon/gvfsjob.h index 36d4adfc..254f7ac7 100644 --- a/daemon/gvfsjob.h +++ b/daemon/gvfsjob.h @@ -93,6 +93,10 @@ void g_vfs_job_failed (GVfsJob *job, gint code, const gchar *format, ...) G_GNUC_PRINTF (4, 5); +void g_vfs_job_failed_literal (GVfsJob *job, + GQuark domain, + gint code, + const gchar *message); void g_vfs_job_failed_from_error (GVfsJob *job, const GError*error); void g_vfs_job_failed_from_errno (GVfsJob *job, |