1 files changed, 27 insertions, 15 deletions

diff --git a/ntpq/ntpq.h b/ntpq/ntpq.h
index 0f29fd53c9d28..77d5ce7f9afb3 100644
--- a/ntpq/ntpq.h
+++ b/ntpq/ntpq.h
@@ -6,6 +6,7 @@
 #include "ntp_control.h"
 #include "ntp_string.h"
 #include "ntp_malloc.h"
+#include "lib_strbuf.h"
 
 /*
  * Maximum number of arguments
@@ -34,7 +35,7 @@ typedef union {
 	char *string;
 	long ival;
 	u_long uval;
-	struct sockaddr_storage netnum;
+	sockaddr_u netnum;
 } arg_v;
 
 /*
@@ -53,7 +54,7 @@ struct parse {
  */
 struct xcmd {
   const char *keyword;		/* command key word */
-	void (*handler)	P((struct parse *, FILE *));	/* command handler */
+	void (*handler)	(struct parse *, FILE *);	/* command handler */
 	u_char arg[MAXARGS];	/* descriptors for arguments */
   const char *desc[MAXARGS];	/* descriptions for arguments */
   const char *comment;
@@ -63,7 +64,7 @@ struct xcmd {
  * Structure to hold association data
  */
 struct association {
-	u_short assid;
+	associd_t assid;
 	u_short status;
 };
 
@@ -79,15 +80,26 @@ struct ctl_var {
 	const char *text;
 };
 
-extern	void	asciize		P((int, char *, FILE *));
-extern	int	getnetnum	P((const char *, struct sockaddr_storage *, char *, int));
-extern	void	sortassoc	P((void));
-extern	int	doquery		P((int, int, int, int, char *, u_short *, int *, char **));
-extern	char *	nntohost	P((struct sockaddr_storage *));
-extern	int	decodets	P((char *, l_fp *));
-extern	int	decodeuint	P((char *, u_long *));
-extern	int	nextvar		P((int *, char **, char **, char **));
-extern	int	decodetime	P((char *, l_fp *));
-extern	void	printvars	P((int, char *, int, int, FILE *));
-extern	int	decodeint	P((char *, long *));
-extern	int	findvar		P((char *, struct ctl_var *, int code));
+extern int	interactive;	/* are we prompting? */
+extern int	old_rv;		/* use old rv behavior? --old-rv */
+
+extern	void	asciize		(int, char *, FILE *);
+extern	int	getnetnum	(const char *, sockaddr_u *, char *, int);
+extern	void	sortassoc	(void);
+extern	void	show_error_msg	(int, associd_t);
+extern	int	doquery		(int, associd_t, int, int, char *,
+				 u_short *, int *, const char **);
+extern	int	doqueryex	(int, associd_t, int, int, char *,
+				 u_short *, int *, const char **, int);
+extern	char *	nntohost	(sockaddr_u *);
+extern	char *	nntohost_col	(sockaddr_u *, size_t, int);
+extern	int	decodets	(char *, l_fp *);
+extern	int	decodeuint	(char *, u_long *);
+extern	int	nextvar		(int *, const char **, char **, char **);
+extern	int	decodetime	(char *, l_fp *);
+extern	void	printvars	(int, const char *, int, int, int, FILE *);
+extern	int	decodeint	(char *, long *);
+extern	int	findvar		(char *, struct ctl_var *, int code);
+extern	void	makeascii	(int, const char *, FILE *);
+extern	char *	trunc_left	(const char *, size_t);
+extern	char *	trunc_right	(const char *, size_t);