#985148 variable.c: add prototypes and remove redeclarations

Package:
src:nn
Source:
nn
Submitter:
Bjarni Ingi Gislason
Date:
2021-03-13 16:51:04 UTC
Severity:
normal
Tags:
#985148#5
Date:
2021-03-13 16:49:16 UTC
From:
To:
Dear Maintainer,

  Fix warnings from the compiler about missing prototypes and
repeated declarations.

Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
---
 variable.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/variable.c b/variable.c
index 6d986fa..be0fcc2 100644
--- a/variable.c
+++ b/variable.c
@@ -21,12 +21,23 @@
 /* variable.c */

 static struct variable_defs *lookup_variable(char *variable);
+void		disp_variables(int, char *);
 static char     escaped_char(char c);
 static void     adjust(register char *str);
+void		lock_variable(char *);
+void		mark_var_stack(void);
+void		print_variable_config(FILE *, int);
+int		push_variable(char *);
+void		restore_variables(void);
+int		set_variable(char *, int, char *);
+int		test_variable(char *);
+void		toggle_variable(char *);
+int		var_completion(char *, int);
+void		var_options(char **, register char *, flag_type *);
 static char    *var_value(register struct variable_defs * var, char *tag);
 static int      var_on_stack(register struct variable_defs * var);
-
-extern int      prompt_length, prompt_line;
+void		var_compl_opts(int);
+extern int      prompt_length;
 extern regexp  *pg_regexp;
 extern int      pg_new_regexp;

@@ -129,10 +140,10 @@ extern int			/* boolean variables */

 extern int			/* integer variables */
                 also_read_articles, article_limit, auto_read_limit, auto_select_closed,
-                check_db_update, conf_entry_limit, collapse_subject, Columns,
+                check_db_update, conf_entry_limit, collapse_subject,
                 cross_post_limit, data_bits, Debug, decode_skip_prefix,
                 entry_message_limit, expired_msg_delay, first_page_lines,
-                fmt_linenum, kill_debug, kill_ref_count, Lines, match_skip_prefix,
+                fmt_linenum, kill_debug, kill_ref_count, match_skip_prefix,
                 mark_next_group, mark_read_return, mark_read_skip, menu_spacing,
                 merge_report_rate, message_history, min_pv_window, mouse_usage,
                 multi_key_guard_time, new_group_action, newsrc_update_freq,
@@ -143,8 +154,7 @@ extern int			/* integer variables */
                 sort_mode, subject_match_limit, wrap_headers;

 #ifdef NNTP
-extern char    *nn_directory;
-extern char    *nntp_cache_dir, *nntp_server;
+extern char    *nntp_server;
 extern char    *nntp_user, *nntp_password;
 extern int      nntp_cache_size, nntp_debug, nntp_debug_delay;
 #endif