From 24bda30176b81f5f6916ef96ffb2f4550f018923 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Sun, 12 Aug 2012 20:08:11 +0400
Subject: [PATCH] (edit_save_cmd): return gboolean instead of int.

(edit_save_as_cmd): likewise.
(edit_save_confirm_cmd): likewise.

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

diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h
index fd31a9ca7..faa27d425 100644
--- a/src/editor/edit-impl.h
+++ b/src/editor/edit-impl.h
@@ -222,8 +222,8 @@ void edit_insert_ahead (WEdit * edit, int c);
 long edit_write_stream (WEdit * edit, FILE * f);
 char *edit_get_write_filter (const vfs_path_t * write_name_vpath,
                              const vfs_path_t * filename_vpath);
-int edit_save_confirm_cmd (WEdit * edit);
-int edit_save_as_cmd (WEdit * edit);
+gboolean edit_save_confirm_cmd (WEdit * edit);
+gboolean edit_save_as_cmd (WEdit * edit);
 WEdit *edit_init (WEdit * edit, int y, int x, int lines, int cols,
                   const vfs_path_t * filename_vpath, long line);
 gboolean edit_clean (WEdit * edit);
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index a986e955a..f11b37b6a 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -470,9 +470,9 @@ edit_get_save_file_as (WEdit * edit)
 
 /* --------------------------------------------------------------------------------------------- */
 
-/** returns 1 on success */
+/** returns TRUE on success */
 
-static int
+static gboolean
 edit_save_cmd (WEdit * edit)
 {
     int res, save_lock = 0;
@@ -486,7 +486,7 @@ edit_save_cmd (WEdit * edit)
         edit->locked = unlock_file (edit->filename_vpath);
 
     /* On failure try 'save as', it does locking on its own */
-    if (!res)
+    if (res == 0)
         return edit_save_as_cmd (edit);
     edit->force |= REDRAW_COMPLETELY;
     if (res > 0)
@@ -495,7 +495,7 @@ edit_save_cmd (WEdit * edit)
         edit->modified = 0;
     }
 
-    return 1;
+    return TRUE;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -1676,8 +1676,8 @@ edit_set_filename (WEdit * edit, const vfs_path_t * name_vpath)
 /* --------------------------------------------------------------------------------------------- */
 /* Here we want to warn the users of overwriting an existing file,
    but only if they have made a change to the filename */
-/* returns 1 on success */
-int
+/* returns TRUE on success */
+gboolean
 edit_save_as_cmd (WEdit * edit)
 {
     /* This heads the 'Save As' dialog box */
@@ -1686,7 +1686,7 @@ edit_save_as_cmd (WEdit * edit)
     int different_filename = 0;
 
     if (!edit_check_newline (edit))
-        return 0;
+        return FALSE;
 
     exp_vpath = edit_get_save_file_as (edit);
     edit_push_undo_action (edit, KEY_PRESS + edit->start_display);
@@ -1774,7 +1774,7 @@ edit_save_as_cmd (WEdit * edit)
                     edit_load_syntax (edit, NULL, edit->syntax_type);
                 vfs_path_free (exp_vpath);
                 edit->force |= REDRAW_COMPLETELY;
-                return 1;
+                return TRUE;
             default:
                 edit_error_dialog (_("Save as"), get_sys_error (_("Cannot save file")));
                 /* fallthrough */
@@ -1790,7 +1790,7 @@ edit_save_as_cmd (WEdit * edit)
   ret:
     vfs_path_free (exp_vpath);
     edit->force |= REDRAW_COMPLETELY;
-    return 0;
+    return FALSE;
 }
 
 /* {{{ Macro stuff starts here */
@@ -2056,18 +2056,18 @@ edit_load_macro_cmd (WEdit * edit)
 /* }}} Macro stuff end here */
 
 /* --------------------------------------------------------------------------------------------- */
-/** returns 1 on success */
+/** returns TRUE on success */
 
-int
+gboolean
 edit_save_confirm_cmd (WEdit * edit)
 {
-    gchar *f = NULL;
+    char *f = NULL;
 
     if (edit->filename_vpath == NULL)
         return edit_save_as_cmd (edit);
 
     if (!edit_check_newline (edit))
-        return 0;
+        return FALSE;
 
     if (edit_confirm_save)
     {
@@ -2080,7 +2080,7 @@ edit_save_confirm_cmd (WEdit * edit)
         ok = (edit_query_dialog2 (_("Save file"), f, _("&Save"), _("&Cancel")) == 0);
         g_free (f);
         if (!ok)
-            return 0;
+            return FALSE;
     }
     return edit_save_cmd (edit);
 }
-- 
2.11.4.GIT