From f708037715a07514c6812ff8195b53605693999b Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 8 Jul 2004 17:15:10 +0000 Subject: [PATCH] add another prototype fix and a few spacing fixes git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1849 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 6 +++--- src/files.c | 5 +++-- src/nano.c | 7 ++++--- src/proto.h | 21 ++++++++++++--------- src/utils.c | 4 ++-- src/winio.c | 4 ++-- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index d80bcf27..c35b1819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,9 +42,9 @@ CVS code - do_exit() - Tweak for efficiency. (David Benbennick) - proto.h: - - Change the last variables in the prototypes for do_justify() - and get_mouseinput() to match the ones used in the actual - functions. (DLR) + - Change the variables in the prototypes for do_justify(), + get_verbatim_kbinput(), and get_mouseinput() to match the ones + used in the actual functions. (DLR) - Remove unused declaration of temp_opt. (David Benbennick) - rcfile.c: parse_rcfile() diff --git a/src/files.c b/src/files.c index a9f3689b..b6c8d1c7 100644 --- a/src/files.c +++ b/src/files.c @@ -665,7 +665,7 @@ openfilestruct *make_new_opennode(openfilestruct *prevnode) /* Splice a node into an existing openfilestruct. */ void splice_opennode(openfilestruct *begin, openfilestruct *newnode, - openfilestruct *end) + openfilestruct *end) { newnode->next = end; newnode->prev = begin; @@ -2205,7 +2205,8 @@ char **cwd_tab_completion(char *buf, int *num_matches) /* This function now has an arg which refers to how much the statusbar * (place) should be advanced, i.e. the new cursor pos. */ -char *input_tab(char *buf, int place, int *lastwastab, int *newplace, int *list) +char *input_tab(char *buf, int place, int *lastwastab, int *newplace, int + *list) { /* Do TAB completion */ static int num_matches = 0, match_matches = 0; diff --git a/src/nano.c b/src/nano.c index 5d8f184b..b9a51171 100644 --- a/src/nano.c +++ b/src/nano.c @@ -504,7 +504,8 @@ filestruct *copy_node(const filestruct *src) } /* Splice a node into an existing filestruct. */ -void splice_node(filestruct *begin, filestruct *newnode, filestruct *end) +void splice_node(filestruct *begin, filestruct *newnode, filestruct + *end) { if (newnode != NULL) { newnode->next = end; @@ -606,8 +607,8 @@ void renumber(filestruct *fileptr) /* Print one usage string to the screen, removes lots of duplicate * strings to translate and takes out the parts that shouldn't be * translatable (the flag names). */ -void print1opt(const char *shortflag, const char *longflag, - const char *desc) +void print1opt(const char *shortflag, const char *longflag, const char + *desc) { printf(" %s\t", shortflag); if (strlen(shortflag) < 8) diff --git a/src/proto.h b/src/proto.h index 670f618b..6fb44210 100644 --- a/src/proto.h +++ b/src/proto.h @@ -165,7 +165,8 @@ void do_insertfile(int loading_file); void do_insertfile_void(void); #ifdef ENABLE_MULTIBUFFER openfilestruct *make_new_opennode(openfilestruct *prevnode); -void splice_opennode(openfilestruct *begin, openfilestruct *newnode, openfilestruct *end); +void splice_opennode(openfilestruct *begin, openfilestruct *newnode, + openfilestruct *end); void unlink_opennode(const openfilestruct *fileptr); void delete_opennode(openfilestruct *fileptr); void free_openfilestruct(openfilestruct *src); @@ -202,7 +203,8 @@ char *real_dir_from_tilde(const char *buf); int append_slash_if_dir(char *buf, int *lastwastab, int *place); char **username_tab_completion(char *buf, int *num_matches); char **cwd_tab_completion(char *buf, int *num_matches); -char *input_tab(char *buf, int place, int *lastwastab, int *newplace, int *list); +char *input_tab(char *buf, int place, int *lastwastab, int *newplace, + int *list); #endif const char *tail(const char *foo); #ifndef DISABLE_BROWSER @@ -266,15 +268,16 @@ void help_init(void); #endif filestruct *make_new_node(filestruct *prevnode); filestruct *copy_node(const filestruct *src); -void splice_node(filestruct *begin, filestruct *newnode, filestruct *end); +void splice_node(filestruct *begin, filestruct *newnode, filestruct + *end); void unlink_node(const filestruct *fileptr); void delete_node(filestruct *fileptr); filestruct *copy_filestruct(const filestruct *src); void free_filestruct(filestruct *src); void renumber_all(void); void renumber(filestruct *fileptr); -void print1opt(const char *shortflag, const char *longflag, - const char *desc); +void print1opt(const char *shortflag, const char *longflag, const char + *desc); void usage(void); void version(void); int no_help(void); @@ -466,8 +469,8 @@ void *nrealloc(void *ptr, size_t howmuch); char *mallocstrcpy(char *dest, const char *src); void new_magicline(void); #ifndef NANO_SMALL -void mark_order(const filestruct **top, size_t *top_x, - const filestruct **bot, size_t *bot_x); +void mark_order(const filestruct **top, size_t *top_x, const filestruct + **bot, size_t *bot_x); #endif #ifndef DISABLE_TABCOMP int check_wildcard_match(const char *text, const char *pattern); @@ -492,8 +495,8 @@ int get_control_kbinput(int kbinput); int get_escape_seq_kbinput(int *escape_seq, size_t es_len, int *ignore_seq); int get_escape_seq_abcd(int kbinput); -int *get_verbatim_kbinput(WINDOW *win, int *verbatim_kbinput, size_t - *verbatim_len, int allow_ascii); +int *get_verbatim_kbinput(WINDOW *win, int *v_kbinput, size_t *v_len, + int allow_ascii); int get_untranslated_kbinput(int kbinput, size_t position, int allow_ascii #ifndef NANO_SMALL diff --git a/src/utils.c b/src/utils.c index f18d11dd..65cd6819 100644 --- a/src/utils.c +++ b/src/utils.c @@ -352,8 +352,8 @@ void new_magicline(void) #ifndef NANO_SMALL /* Set top_x and bot_x to the top and bottom x-coordinates of the mark, * respectively, based on the locations of top and bot. */ -void mark_order(const filestruct **top, size_t *top_x, - const filestruct **bot, size_t *bot_x) +void mark_order(const filestruct **top, size_t *top_x, const filestruct + **bot, size_t *bot_x) { assert(top != NULL && top_x != NULL && bot != NULL && bot_x != NULL); if ((current->lineno == mark_beginbuf->lineno && current_x > mark_beginx) diff --git a/src/winio.c b/src/winio.c index e6417450..72cc5d68 100644 --- a/src/winio.c +++ b/src/winio.c @@ -1069,8 +1069,8 @@ int get_escape_seq_abcd(int kbinput) /* Read in a string of input characters (e.g. an escape sequence) * verbatim. Store the string in v_kbinput and return the length * of the string in v_len. Assume nodelay(win) is FALSE. */ -int *get_verbatim_kbinput(WINDOW *win, int *v_kbinput, size_t - *v_len, int allow_ascii) +int *get_verbatim_kbinput(WINDOW *win, int *v_kbinput, size_t *v_len, + int allow_ascii) { int kbinput; size_t i = 0, v_newlen = 0; -- 2.39.5