add more int -> bool conversions

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1893 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/src/cut.c b/src/cut.c
index 4de51ceded62036015b93f4bf7b7f00ad17763fc..992abd666d573fe41eb977cd547fe4c081fa7229 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -28,13 +28,13 @@
 #include "proto.h"
 #include "nano.h"
 
-static int keep_cutbuffer = FALSE;
+static bool keep_cutbuffer = FALSE;
        /* Should we keep the contents of the cutbuffer? */
 static int marked_cut;
        /* Is the cutbuffer from a mark?  0 means whole-line cut, 1
         * means mark, and 2 means cut-from-cursor. */
 #ifndef NANO_SMALL
-static int concatenate_cut;
+static bool concatenate_cut;
        /* Should we add this cut string to the end of the last one? */
 #endif
 static filestruct *cutbottom = NULL;
@@ -50,7 +50,7 @@ filestruct *get_cutbottom(void)
     return cutbottom;
 }
 
-void add_to_cutbuffer(filestruct *inptr, int allow_concat)
+void add_to_cutbuffer(filestruct *inptr, bool allow_concat)
 {
 #ifdef DEBUG
     fprintf(stderr, "add_to_cutbuffer(): inptr->data = %s\n", inptr->data);
@@ -61,7 +61,7 @@ void add_to_cutbuffer(filestruct *inptr, int allow_concat)
 #ifndef NANO_SMALL
     else if (allow_concat && concatenate_cut) {
        /* Just tack the text in inptr onto the text in cutbottom,
-        * unless allow_concat is false. */
+        * unless allow_concat is FALSE. */
        cutbottom->data = charealloc(cutbottom->data,
                strlen(cutbottom->data) + strlen(inptr->data) + 1);
        strcat(cutbottom->data, inptr->data);

diff --git a/src/global.c b/src/global.c
index c5dd94230caf78ee3ef27c6b989bed76f64cdf6d..79f817652a67920d7e0181436af5253d78f33d15 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -174,11 +174,10 @@ regmatch_t regmatches[10];        /* Match positions for parenthetical
                                   subexpressions, max of 10 */
 #endif
 
-int curses_ended = FALSE;      /* Indicates to statusbar() to simply
+bool curses_ended = FALSE;     /* Indicates to statusbar() to simply
                                 * write to stderr, since endwin() has
                                 * ended curses mode. */
 
-
 size_t length_of_list(const shortcut *s)
 {
     size_t i = 0;
@@ -371,7 +370,6 @@ void shortcut_init(int unjustify)
                NANO_NO_KEY, VIEW, do_exit);
     else
 #endif
-
     /* Translators: try to keep this string under 10 characters long */
        sc_init_one(&main_list, NANO_EXIT_KEY, exit_msg,
                IFHELP(nano_exit_msg, NANO_NO_KEY), NANO_EXIT_FKEY,