diff --git a/src/files.c b/src/files.c index e319a51114679d7a93ad5e89b8b27953a80f809e..019114c0569f984376c661d237f1cba42cb21b7b 100644 --- a/src/files.c +++ b/src/files.c @@ -154,7 +154,7 @@ filestruct *read_line(char *buf, filestruct *prev, int *line1ins, size_t return fileptr; } -int read_file(FILE *f, const char *filename, int quiet) +void read_file(FILE *f, const char *filename, int quiet) { int num_lines = 0, len = 0; char input = '\0'; /* current input character */ @@ -336,7 +336,7 @@ int read_file(FILE *f, const char *filename, int quiet) totlines += num_lines; - return 1; + return; } /* Open the file (and decide if it exists). */ @@ -552,12 +552,13 @@ void do_insertfile(int loading_file) if (i == NANO_EXTCMD_KEY) { realname = mallocstrcpy(realname, ""); i = open_pipe(answer); - } else -#endif /* NANO_SMALL */ - { + } else { +#endif realname = real_dir_from_tilde(answer); i = open_file(realname, 1, loading_file); +#ifndef NANO_SMALL } +#endif #ifdef ENABLE_MULTIBUFFER if (loading_file) { diff --git a/src/proto.h b/src/proto.h index 6fb442103485fcb0db773c8b287dcf8000123e01..3aef035f770f5782d497e304b6461290379b4bdb 100644 --- a/src/proto.h +++ b/src/proto.h @@ -158,7 +158,7 @@ void load_file(int update); void new_file(void); filestruct *read_line(char *buf, filestruct *prev, int *line1ins, size_t len); -int read_file(FILE *f, const char *filename, int quiet); +void read_file(FILE *f, const char *filename, int quiet); int open_file(const char *filename, int insert, int quiet); char *get_next_filename(const char *name); void do_insertfile(int loading_file);