ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add another missing part of DB's patch (read_file() should be returning 

void instead of int), and rearrange one NANO_SMALL #ifdef for better
readability


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1851 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-07-10 16:53:17 +00:00
parent 0273829353
commit d717d4bac6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/files.c
View File

@ -154,7 +154,7 @@ filestruct *read_line(char *buf, filestruct *prev, int *line1ins, size_t
return fileptr; 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; int num_lines = 0, len = 0;
char input = '\0'; /* current input character */ char input = '\0'; /* current input character */
@ -336,7 +336,7 @@ int read_file(FILE *f, const char *filename, int quiet)
totlines += num_lines; totlines += num_lines;
return 1; return;
} }
/* Open the file (and decide if it exists). */ /* Open the file (and decide if it exists). */
@ -552,12 +552,13 @@ void do_insertfile(int loading_file)
if (i == NANO_EXTCMD_KEY) { if (i == NANO_EXTCMD_KEY) {
realname = mallocstrcpy(realname, ""); realname = mallocstrcpy(realname, "");
i = open_pipe(answer); i = open_pipe(answer);
} else } else {
#endif /* NANO_SMALL */ #endif
{
realname = real_dir_from_tilde(answer); realname = real_dir_from_tilde(answer);
i = open_file(realname, 1, loading_file); i = open_file(realname, 1, loading_file);
#ifndef NANO_SMALL
} }
#endif
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
if (loading_file) { if (loading_file) {

2
src/proto.h
View File

@ -158,7 +158,7 @@ void load_file(int update);
void new_file(void); void new_file(void);
filestruct *read_line(char *buf, filestruct *prev, int *line1ins, size_t filestruct *read_line(char *buf, filestruct *prev, int *line1ins, size_t
len); 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); int open_file(const char *filename, int insert, int quiet);
char *get_next_filename(const char *name); char *get_next_filename(const char *name);
void do_insertfile(int loading_file); void do_insertfile(int loading_file);