From 82dc1c17f2d1c088dd90561ec7ce5a3e15d8b5f4 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 12 Aug 2004 03:27:54 +0000 Subject: [PATCH] add more int -> bool conversions git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1893 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- src/cut.c | 8 ++++---- src/global.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/cut.c b/src/cut.c index 4de51ced..992abd66 100644 --- 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 c5dd9423..79f81765 100644 --- 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, -- 2.39.5