From 702b09c85935e1d3328a7a9999c79c533b7987d3 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sun, 23 Oct 2016 20:06:45 +0200
Subject: [PATCH] tweaks: elide a parameter that is always FALSE
---
src/files.c | 20 +++++---------------
src/proto.h | 7 -------
2 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/src/files.c b/src/files.c
index f38cd984..8fe084ab 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1058,18 +1058,12 @@ char *get_next_filename(const char *name, const char *suffix)
return buf;
}
-/* Insert a file into a new buffer if the MULTIBUFFER flag is set, or
- * into the current buffer if it isn't. If execute is TRUE, insert the
- * output of an executed command instead of a file. */
-void do_insertfile(
-#ifndef NANO_TINY
- bool execute
-#else
- void
-#endif
- )
+/* Insert a file into the current buffer, or into a new buffer when
+ * the MULTIBUFFER flag is set. */
+void do_insertfile(void)
{
int i;
+ bool execute = FALSE;
const char *msg;
char *given = mallocstrcpy(NULL, "");
/* The last answer the user typed at the statusbar prompt. */
@@ -1345,11 +1339,7 @@ void do_insertfile_void(void)
statusbar(_("Key invalid in non-multibuffer mode"));
else
#endif
- do_insertfile(
-#ifndef NANO_TINY
- FALSE
-#endif
- );
+ do_insertfile();
}
/* When passed "[relative path]" or "[relative path][filename]" in
diff --git a/src/proto.h b/src/proto.h
index dc46766a..8bb16da0 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -311,13 +311,6 @@ filestruct *read_line(char *buf, size_t buf_len, filestruct *prevnode);
void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkwritable);
int open_file(const char *filename, bool newfie, bool quiet, FILE **f);
char *get_next_filename(const char *name, const char *suffix);
-void do_insertfile(
-#ifndef NANO_TINY
- bool execute
-#else
- void
-#endif
- );
void do_insertfile_void(void);
char *get_full_path(const char *origpath);
char *check_writable_directory(const char *path);
--
GitLab