From 1c9dd109bf4ba729c15418034737c82de6f399af Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 21 Nov 2006 17:05:04 +0000 Subject: [PATCH] in edit_draw(), fix potential warnings when assigning -1 to paintlen by using if/else clauses instead of "?" operators git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3964 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++++ src/winio.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a3c009e..2f6c6094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ CVS code - consistency. (DLR) - Rename NANO_ALT_.* and NANO_.*ALTKEY to NANO_META_.* and NANO_.*METAKEY, for consistency. (DLR) +- winio.c: + edit_draw() + - Fix potential warnings when assigning -1 to paintlen by using + if/else clauses instead of "?" operators. (DLR) - BUGS: - Miscellaneous cosmetic fixes. (DLR) diff --git a/src/winio.c b/src/winio.c index a3194557..b9a055dd 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2513,9 +2513,12 @@ void edit_draw(const filestruct *fileptr, const char *converted, int * expanded location of the end of the match minus * the expanded location of the beginning of the * page. */ - paintlen = (end_line != fileptr) ? -1 : - actual_x(converted, strnlenpt(fileptr->data, - endmatch.rm_eo) - start); + if (end_line != fileptr) + paintlen = -1; + else + paintlen = actual_x(converted, + strnlenpt(fileptr->data, + endmatch.rm_eo) - start); mvwaddnstr(edit, line, 0, converted, paintlen); @@ -2639,8 +2642,11 @@ void edit_draw(const filestruct *fileptr, const char *converted, int * Otherwise, paintlen is the expanded location of the end * of the mark minus the expanded location of the beginning * of the mark. */ - paintlen = (bot_x >= endpos) ? -1 : strnlenpt(fileptr->data, - bot_x) - (x_start + start); + if (bot_x >= endpos) + paintlen = -1; + else + paintlen = strnlenpt(fileptr->data, bot_x) - (x_start + + start); /* If x_start is before the beginning of the page, shift * paintlen x_start characters to compensate, and put -- 2.39.5