From e019c677bb2d48f171e14d65d2eb2e7ece2d0bc0 Mon Sep 17 00:00:00 2001 From: Brian Vuyk Date: Sun, 16 Nov 2008 00:10:39 +0100 Subject: [PATCH] Arrange file saving for error handling to fix warnings --- katze/katze-net.c | 8 +++++++- midori/midori-browser.c | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/katze/katze-net.c b/katze/katze-net.c index 9b81a38d..9fa651e2 100644 --- a/katze/katze-net.c +++ b/katze/katze-net.c @@ -419,6 +419,7 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, FILE* fp; GdkPixbuf* pixbuf_scaled; gint icon_width, icon_height; + size_t ret; if (request->status == KATZE_NET_MOVED) return; @@ -428,8 +429,13 @@ katze_net_icon_transfer_cb (KatzeNetRequest* request, { if ((fp = fopen (priv->icon_file, "wb"))) { - fwrite (request->data, 1, request->length, fp); + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); + if ((ret - request->length) != 0) + { + /* FIXME: We need error handling. If this is called, + it means there was a write error */ + } pixbuf = gdk_pixbuf_new_from_file (priv->icon_file, NULL); } else diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 68ecac19..221ba366 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -635,14 +635,20 @@ midori_browser_save_transfer_cb (KatzeNetRequest* request, gchar* filename) { FILE* fp; + size_t ret; if (request->data) { /* FIXME: Show an error message if the file cannot be saved */ if ((fp = fopen (filename, "wb"))) { - fwrite (request->data, 1, request->length, fp); + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); + if ((ret - request->length) != 0) + { + /* FIXME: We need error handling. If this is called, + i means there was a write error */ + } } } g_free (filename); @@ -1822,6 +1828,7 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, gchar* text_editor; gint fd; FILE* fp; + size_t ret; if (request->data) { @@ -1833,8 +1840,13 @@ midori_browser_source_transfer_cb (KatzeNetRequest* request, { if ((fp = fdopen (fd, "w"))) { - fwrite (request->data, 1, request->length, fp); + ret = fwrite (request->data, 1, request->length, fp); fclose (fp); + if ((ret - request->length) != 0) + { + /* FIXME: We need error handling. If this is called, + it means there was a write error */ + } g_object_get (browser->settings, "text-editor", &text_editor, NULL); sokoke_spawn_program (text_editor, unique_filename);