[COMMITTED] tzset: Clean up preprocessor macros min, max, sign

Submitted by Florian Weimer on March 7, 2017, 4:50 p.m.

Details

Message ID 9437a65a-cd13-c94c-60ba-0493cf65a21c@redhat.com
State New
Headers show

Commit Message

Florian Weimer March 7, 2017, 4:50 p.m.
sign is even used as an identifier later in the file (and there is no 
conflict only because the use is not function-like).

Florian

Patch hide | download patch | download mbox

2017-03-07  Florian Weimer  <fweimer@redhat.com>

	* time/tzset.c (compute_offset): Open-code min macro.
	(min, max, sign): Remove.

diff --git a/time/tzset.c b/time/tzset.c
index f0e5c95..8868e9a 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -38,12 +38,6 @@  weak_alias (__timezone, timezone)
 /* This locks all the state variables in tzfile.c and this file.  */
 __libc_lock_define_initialized (static, tzset_lock)
 
-
-#define	min(a, b)	((a) < (b) ? (a) : (b))
-#define	max(a, b)	((a) > (b) ? (a) : (b))
-#define	sign(x)		((x) < 0 ? -1 : 1)
-
-
 /* This structure contains all the information about a
    timezone given in the POSIX standard TZ envariable.  */
 typedef struct
@@ -142,7 +136,13 @@  update_vars (void)
 static unsigned int
 compute_offset (unsigned int ss, unsigned int mm, unsigned int hh)
 {
-  return min (ss, 59) + min (mm, 59) * 60 + min (hh, 24) * 60 * 60;
+  if (ss > 59)
+    ss = 59;
+  if (mm > 59)
+    mm = 59;
+  if (hh > 24)
+    hh = 24;
+  return ss + mm * 60 + hh * 60 * 60;
 }
 
 /* Parses the time zone name at *TZP, and writes a pointer to an