From 70528dc30a1773dc94e1817d30d7a80beceee5fb Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Sun, 12 Aug 2012 19:37:56 +0400
Subject: [PATCH] (edit_save_block): return gboolean instead of int.

(edit_save_block_cmd): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 src/editor/edit-impl.h |  4 ++--
 src/editor/editcmd.c   | 55 +++++++++++++++++++++-----------------------------
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h
index f88ad9b3b..221c12464 100644
--- a/src/editor/edit-impl.h
+++ b/src/editor/edit-impl.h
@@ -250,8 +250,8 @@ void edit_spellcheck_file (WEdit * edit);
 void edit_set_spell_lang (void);
 #endif
 
-int edit_save_block (WEdit * edit, const char *filename, long start, long finish);
-int edit_save_block_cmd (WEdit * edit);
+gboolean edit_save_block (WEdit * edit, const char *filename, long start, long finish);
+gboolean edit_save_block_cmd (WEdit * edit);
 gboolean edit_insert_file_cmd (WEdit * edit);
 void edit_insert_over (WEdit * edit);
 int edit_insert_column_of_text_from_file (WEdit * edit, int file,
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 77198554b..7006f2a67 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -1044,11 +1044,12 @@ edit_get_block (WEdit * edit, long start, long finish, int *l)
 /* --------------------------------------------------------------------------------------------- */
 /** copies a block to clipboard file */
 
-static int
+static gboolean
 edit_save_block_to_clip_file (WEdit * edit, long start, long finish)
 {
-    int ret;
+    gboolean ret;
     gchar *tmp;
+
     tmp = mc_config_get_full_path (EDIT_CLIP_FILE);
     ret = edit_save_block (edit, tmp, start, finish);
     g_free (tmp);
@@ -2904,9 +2905,9 @@ edit_ok_to_exit (WEdit * edit)
 }
 
 /* --------------------------------------------------------------------------------------------- */
-/** save block, returns 1 on success */
+/** save block, returns TRUE on success */
 
-int
+gboolean
 edit_save_block (WEdit * edit, const char *filename, long start, long finish)
 {
     int len, file;
@@ -2917,7 +2918,7 @@ edit_save_block (WEdit * edit, const char *filename, long start, long finish)
                     S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH | O_BINARY);
     vfs_path_free (vpath);
     if (file == -1)
-        return 0;
+        return FALSE;
 
     if (edit->column_highlight)
     {
@@ -2958,9 +2959,8 @@ edit_save_block (WEdit * edit, const char *filename, long start, long finish)
         g_free (buf);
     }
     mc_close (file);
-    if (len)
-        return 0;
-    return 1;
+
+    return (len == 0);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -3071,16 +3071,17 @@ edit_goto_cmd (WEdit * edit)
 
 
 /* --------------------------------------------------------------------------------------------- */
-/** Return 1 on success */
+/** Return TRUE on success */
 
-int
+gboolean
 edit_save_block_cmd (WEdit * edit)
 {
     long start_mark, end_mark;
     char *exp, *tmp;
+    gboolean ret = FALSE;
 
     if (eval_marks (edit, &start_mark, &end_mark))
-        return 1;
+        return TRUE;
 
     tmp = mc_config_get_full_path (EDIT_CLIP_FILE);
     exp =
@@ -3088,30 +3089,20 @@ edit_save_block_cmd (WEdit * edit)
                              MC_HISTORY_EDIT_SAVE_BLOCK, tmp);
     g_free (tmp);
     edit_push_undo_action (edit, KEY_PRESS + edit->start_display);
-    if (exp)
+
+    if (exp != NULL && *exp != '\0')
     {
-        if (!*exp)
-        {
-            g_free (exp);
-            return 0;
-        }
+        if (edit_save_block (edit, exp, start_mark, end_mark))
+            ret = TRUE;
         else
-        {
-            if (edit_save_block (edit, exp, start_mark, end_mark))
-            {
-                g_free (exp);
-                edit->force |= REDRAW_COMPLETELY;
-                return 1;
-            }
-            else
-            {
-                g_free (exp);
-                edit_error_dialog (_("Save block"), get_sys_error (_("Cannot save file")));
-            }
-        }
+            edit_error_dialog (_("Save block"), get_sys_error (_("Cannot save file")));
+
+        edit->force |= REDRAW_COMPLETELY;
     }
-    edit->force |= REDRAW_COMPLETELY;
-    return 0;
+
+    g_free (exp);
+
+    return ret;
 }
 
 
-- 
2.11.4.GIT