From: Kalev Soikonen <ksop@hot.ee>
Date: Sun, 27 Jul 2008 23:13:53 +0000 (+0300)
Subject: hwclock: unshadow a diagnostic printf
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d458f94a7cdf0ec9bc11518d49c8ad39d78da7c0;p=util-linux

hwclock: unshadow a diagnostic printf

- Bogus if test means one message is never produced.

- Avoid needless passing of a global variable (debug).

The --test option flag ought to be a global as well (and perhaps -n/--dry-run).

Signed-off-by: Kalev Soikonen <ksop@hot.ee>
---

diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 1fb00582..619ff79f 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -851,8 +851,7 @@ calculate_adjustment(const double factor,
                      const double not_adjusted,
                      const time_t systime,
                      int *adjustment_p,
-                     double *retro_p,
-                     const int debug ) {
+                     double *retro_p) {
 /*----------------------------------------------------------------------------
   Do the drift adjustment calculation.
 
@@ -992,8 +991,7 @@ do_adjustment(struct adjtime *adjtime_p,
                          adjtime_p->last_adj_time,
                          adjtime_p->not_adjusted,
                          hclocktime,
-                         &adjustment, &retro,
-                         debug );
+                         &adjustment, &retro);
     if (adjustment > 0 || adjustment < -1) {
       set_hardware_clock_exact(hclocktime + adjustment,
                                time_inc(read_time, -retro),
@@ -1512,7 +1510,7 @@ main(int argc, char **argv) {
 		permitted = TRUE;
 	else {
 		/* program is designed to run setuid (in some situations) */
-		if (set || hctosys || systohc || adjust) {
+		if (set || systohc || adjust) {
 			fprintf(stderr,
 				_("Sorry, only the superuser can change "
 				  "the Hardware Clock.\n"));