From: Dave Hart <hart@ntp.org>
Date: Thu, 14 Oct 2010 14:32:58 +0000 (+0000)
Subject: correct prior merge of ntpq.c
X-Git-Tag: NTP_4_2_7P64~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e89f4a01b8b05adf1f3aebe032a055cf64dd0ecb;p=thirdparty%2Fntp.git

correct prior merge of ntpq.c

bk: 4cb7149ad_YLjqNnG5WZ-Ox92eEkVw
---

diff --git a/ntpq/libntpq.c b/ntpq/libntpq.c
index 9363d0743..401af80e5 100644
--- a/ntpq/libntpq.c
+++ b/ntpq/libntpq.c
@@ -124,7 +124,7 @@ int ntpq_stripquotes ( char *resultbuf, char *srcbuf, int datalen, int maxlen )
 
 size_t
 ntpq_getvar(
-	char *		resultbuf,
+	const char *	resultbuf,
 	size_t		datalen,
 	const char *	varname,
 	char *		varvalue,
@@ -485,11 +485,11 @@ ntpq_read_sysvars(
 	char *	resultbuf,
 	size_t	maxsize)
 {
-	char *	datap;
-	int	res;
-	int	i_dsize;
-	size_t	dsize;
-	u_short	rstatus;
+	const char *	datap;
+	int		res;
+	int		i_dsize;
+	size_t		dsize;
+	u_short		rstatus;
 
 	res = doquery(CTL_OP_READVAR, 0, 0, 0, NULL, &rstatus,
 		      &i_dsize, &datap);
diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 16279762c..8b0c01234 100644
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -1318,76 +1318,6 @@ sendrequest(
 	return sendpkt((char *)&qpkt, pktsize + maclen);
 }
 
-/*
- * show_error_msg - display the error text for a mode 6 error response.
- */
-void
-show_error_msg(
-	int		m6resp,
-	associd_t	associd
-	)
-{
-	if (numhosts > 1)
-		fprintf(stderr, "server=%s ", currenthost);
-
-	switch(m6resp) {
-
-	case CERR_BADFMT:
-		fprintf(stderr,
-		    "***Server reports a bad format request packet\n");
-		break;
-
-	case CERR_PERMISSION:
-		fprintf(stderr,
-		    "***Server disallowed request (authentication?)\n");
-		break;
-
-	case CERR_BADOP:
-		fprintf(stderr,
-		    "***Server reports a bad opcode in request\n");
-		break;
-
-	case CERR_BADASSOC:
-		fprintf(stderr,
-		    "***Association ID %d unknown to server\n",
-		    associd);
-		break;
-
-	case CERR_UNKNOWNVAR:
-		fprintf(stderr,
-		    "***A request variable unknown to the server\n");
-		break;
-
-	case CERR_BADVALUE:
-		fprintf(stderr,
-		    "***Server indicates a request variable was bad\n");
-		break;
-
-	case ERR_UNSPEC:
-		fprintf(stderr,
-		    "***Server returned an unspecified error\n");
-		break;
-
-	case ERR_TIMEOUT:
-		fprintf(stderr, "***Request timed out\n");
-		break;
-
-	case ERR_INCOMPLETE:
-		fprintf(stderr,
-		    "***Response from server was incomplete\n");
-		break;
-
-	case ERR_TOOMUCH:
-		fprintf(stderr,
-		    "***Buffer size exceeded for returned data\n");
-		break;
-
-	default:
-		fprintf(stderr,
-		    "***Server returns unknown error code %d\n",
-		    m6resp);
-	}
-}
 
 /*
  * show_error_msg - display the error text for a mode 6 error response.