[Git][NTPsec/ntpsec][master] Fix ntpq arg count, another bool.

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
ea4ebf8e by Hal Murray at 2015-11-21T20:15:39Z
Fix ntpq arg count, another bool.

- - - - -


2 changed files:

- ntpq/ntpq.c
- ntpq/ntpq.h


Changes:

=====================================
ntpq/ntpq.c
=====================================
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -47,7 +47,7 @@ const char *prompt = "ntpq> ";	/* prompt to ask him about */
  * libntpq clients such as ntpsnmpd, which are free to reset it as
  * desired.
  */
-int	old_rv = 1;
+bool	old_rv = true;
 
 
 /*
@@ -411,10 +411,10 @@ static const struct option longoptions[] = {
     { "command",	    1, 0, 'c' },
     { "debug",		    0, 0, 'd' },
     { "set-debug-level",    1, 0, 'D' },
-    { "interactive",        1, 0, 'i' },
-    { "numeric",            1, 0, 'n' },
-    { "old-rv",             1, 0, 'O' },
-    { "peers",              1, 0, 'p' },
+    { "interactive",        0, 0, 'i' },
+    { "numeric",            0, 0, 'n' },
+    { "old-rv",             0, 0, 'O' },
+    { "peers",              0, 0, 'p' },
     { "version",	    0, 0, 'V' },
     { "wide",		    0, 0, 'w' },
     { NULL,                 0, 0, '\0'},


=====================================
ntpq/ntpq.h
=====================================
--- a/ntpq/ntpq.h
+++ b/ntpq/ntpq.h
@@ -125,7 +125,7 @@ struct chost_tag {
 extern chost	chosts[];
 
 extern int	interactive;	/* are we prompting? */
-extern int	old_rv;		/* use old rv behavior? --old-rv */
+extern bool	old_rv;		/* use old rv behavior? --old-rv */
 extern u_int	assoc_cache_slots;/* count of allocated array entries */
 extern u_int	numassoc;	/* number of cached associations */
 extern u_int	numhosts;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/ea4ebf8ea3b5b3ff826643cfbd035bd485bc07c7
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151122/b625eae5/attachment.html>