diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/alt_digit.c | 4 | ||||
| -rw-r--r-- | time/asctime.c | 8 | ||||
| -rw-r--r-- | time/strptime_l.c | 10 | ||||
| -rw-r--r-- | time/sys/time.h | 6 | ||||
| -rw-r--r-- | time/tzfile.c | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/time/alt_digit.c b/time/alt_digit.c index 4485b80aa9..3123ef016c 100644 --- a/time/alt_digit.c +++ b/time/alt_digit.c @@ -162,8 +162,8 @@ _nl_parse_alt_digit (const char **strp, struct __locale_data *current) || ! current->private.time->alt_digits_initialized) _nl_init_alt_digit (current); - if (current->private.time != NULL && - current->private.time->alt_digits != NULL) + if (current->private.time != NULL + && current->private.time->alt_digits != NULL) /* Matching is not unambiguous. The alternative digits could be like I, II, III, ... and the first one is a substring of the second and third. Therefore we must keep on searching until we found diff --git a/time/asctime.c b/time/asctime.c index 9dd89a581f..de763e00e0 100644 --- a/time/asctime.c +++ b/time/asctime.c @@ -54,10 +54,10 @@ asctime_internal (const struct tm *tp, char *buf, size_t buflen) } int n = __snprintf (buf, buflen, format, - (tp->tm_wday < 0 || tp->tm_wday >= 7 ? - "???" : ab_day_name (tp->tm_wday)), - (tp->tm_mon < 0 || tp->tm_mon >= 12 ? - "???" : ab_month_name (tp->tm_mon)), + (tp->tm_wday < 0 || tp->tm_wday >= 7 + ? "???" : ab_day_name (tp->tm_wday)), + (tp->tm_mon < 0 || tp->tm_mon >= 12 + ? "???" : ab_month_name (tp->tm_mon)), tp->tm_mday, tp->tm_hour, tp->tm_min, tp->tm_sec, 1900 + tp->tm_year); if (n < 0) diff --git a/time/strptime_l.c b/time/strptime_l.c index 58b271eb37..e19b9a15dd 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -495,8 +495,8 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp, } else { - if (s.decided == not && - strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT)) + if (s.decided == not + && strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT)) s.decided = loc; s.want_xday = 1; break; @@ -641,9 +641,9 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp, } else { - if (s.decided == not && - strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM), - HERE_T_FMT_AMPM)) + if (s.decided == not + && strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM), + HERE_T_FMT_AMPM)) s.decided = loc; break; } diff --git a/time/sys/time.h b/time/sys/time.h index 9d65b2f686..5dbc7fc627 100644 --- a/time/sys/time.h +++ b/time/sys/time.h @@ -159,9 +159,9 @@ extern int futimesat (int __fd, const char *__file, # define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) # define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0) # define timercmp(a, b, CMP) \ - (((a)->tv_sec == (b)->tv_sec) ? \ - ((a)->tv_usec CMP (b)->tv_usec) : \ - ((a)->tv_sec CMP (b)->tv_sec)) + (((a)->tv_sec == (b)->tv_sec) \ + ? ((a)->tv_usec CMP (b)->tv_usec) \ + : ((a)->tv_sec CMP (b)->tv_sec)) # define timeradd(a, b, result) \ do { \ (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ diff --git a/time/tzfile.c b/time/tzfile.c index 7229ed93b7..13a4f48490 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -765,8 +765,8 @@ __tzfile_compute (__time64_t timer, int use_localtime, *leap_correct = leaps[i].change; if (timer == leaps[i].transition && /* Exactly at the transition time. */ - ((i == 0 && leaps[i].change > 0) || - leaps[i].change > leaps[i - 1].change)) + ((i == 0 && leaps[i].change > 0) + || leaps[i].change > leaps[i - 1].change)) { *leap_hit = 1; while (i > 0 |