From 4eeff48c5f8faff963010e26e97d798a244dc1f7 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 5 Nov 2005 04:59:00 +0000 Subject: [PATCH] cosmetic fixes git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3088 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- src/files.c | 3 +-- src/nano.c | 10 +++++----- src/prompt.c | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/files.c b/src/files.c index 12e8b181..d71c115f 100644 --- a/src/files.c +++ b/src/files.c @@ -1562,8 +1562,7 @@ int write_marked_file(const char *name, FILE *f_open, bool tmp, /* If the line at filebot is blank, treat it as the magicline and * hence the end of the file. Otherwise, add a magicline and treat * it as the end of the file. */ - added_magicline = (openfile->filebot->data[0] != '\0'); - if (added_magicline) + if ((added_magicline = (openfile->filebot->data[0] != '\0'))) new_magicline(); retval = write_file(name, f_open, tmp, append, TRUE); diff --git a/src/nano.c b/src/nano.c index 83d3d61f..05279b1e 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1492,11 +1492,11 @@ void do_output(char *output, size_t output_len, bool allow_cntrls) assert(openfile->current_x <= current_len); - charmove(&openfile->current->data[openfile->current_x + - char_buf_len], - &openfile->current->data[openfile->current_x], - current_len - openfile->current_x + char_buf_len); - strncpy(&openfile->current->data[openfile->current_x], char_buf, + charmove(openfile->current->data + openfile->current_x + + char_buf_len, openfile->current->data + + openfile->current_x, current_len - openfile->current_x + + char_buf_len); + strncpy(openfile->current->data + openfile->current_x, char_buf, char_buf_len); current_len += char_buf_len; openfile->totsize++; diff --git a/src/prompt.c b/src/prompt.c index e0e5d4f2..6376a3f4 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -312,10 +312,10 @@ void do_statusbar_output(char *output, size_t output_len, bool assert(statusbar_x <= answer_len); - charmove(&answer[statusbar_x + char_buf_len], - &answer[statusbar_x], answer_len - statusbar_x + + charmove(answer + statusbar_x + char_buf_len, + answer + statusbar_x, answer_len - statusbar_x + char_buf_len); - strncpy(&answer[statusbar_x], char_buf, char_buf_len); + strncpy(answer + statusbar_x, char_buf, char_buf_len); answer_len += char_buf_len; statusbar_x += char_buf_len; -- 2.39.5