Minor style changes and C99 issues (variable definitions after code).

gwsw · Jan 30, 2023 · 8092d98 · 8092d98
1 parent 40ff06b
commit 8092d98
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/less.h b/less.h
@@ -71,7 +71,7 @@
 #include <limits.h>
 #endif
 #if HAVE_STDINT_H
-# include <stdint.h>
+#include <stdint.h>
 #endif
 #if HAVE_STDLIB_H
 #include <stdlib.h>
@@ -81,16 +81,16 @@
 #endif
 
 #if HAVE_STDCKDINT_H
-# include <stdckdint.h>
+#include <stdckdint.h>
 #else
 /*
  * These substitutes for C23 stdckdint macros do not set *R on overflow,
  * and they assume A and B are nonnegative. That is good enough for us.
  */
-# define ckd_add(r, a, b) help_ckd_add(r, a, b, sizeof *(r), signed_expr(*(r)))
-# define ckd_mul(r, a, b) help_ckd_mul(r, a, b, sizeof *(r), signed_expr(*(r)))
+#define ckd_add(r, a, b) help_ckd_add(r, a, b, sizeof *(r), signed_expr(*(r)))
+#define ckd_mul(r, a, b) help_ckd_mul(r, a, b, sizeof *(r), signed_expr(*(r)))
 /* True if the integer expression E, after promotion, is signed. */
-# define signed_expr(e) ((TRUE ? 0 : e) - 1 < 0)
+#define signed_expr(e) ((TRUE ? 0 : e) - 1 < 0)
 #endif
 
 #if defined UINTMAX_MAX

diff --git a/main.c b/main.c
@@ -334,7 +334,7 @@ public void * ecalloc(int count, unsigned int size)
  void * p;
 
  p = (void *) calloc(count, size);
- if (!p)
+ if (p == NULL)
  out_of_memory();
  return p;
 }

diff --git a/optfunc.c b/optfunc.c
@@ -680,7 +680,8 @@ public void set_tabs(char *s, int len)
  /* Start at 1 because tabstops[0] is always zero. */
  for (i = 1; i < TABSTOP_MAX; )
  {
- int n = 0, v = FALSE;
+ int n = 0;
+ int v = FALSE;
  for (; s < es && *s >= '0' && *s <= '9'; s++)
  {
  v |= ckd_mul(&n, n, 10);

diff --git a/os.c b/os.c
@@ -365,8 +365,12 @@ public uintmax muldiv(uintmax val, uintmax num, uintmax den)
  * Like round(val * (double) num / den), but without rounding error.
  * Overflow cannot occur, so there is no need for floating point.
  */
- uintmax q = val / den, r = val % den, qnum = q * num, rnum = r * num,
- quot = qnum + rnum / den, rem = rnum % den;
+ uintmax q = val / den;
+ uintmax r = val % den;
+ uintmax qnum = q * num;
+ uintmax rnum = r * num;
+ uintmax quot = qnum + rnum / den;
+ uintmax rem = rnum % den;
  return quot + (den / 2 < rem + (quot & ~den & 1));
 }
 

diff --git a/xbuf.c b/xbuf.c
@@ -90,50 +90,50 @@ static int help_fixup(void *r, uintmax val, int rsize, int rsigned)
  {
  if (rsize == sizeof (int))
  {
+ int *pr = r;
  if (INT_MAX < val)
  return TRUE;
- int *pr = r;
  *pr = val;
-# ifdef LLONG_MAX
+#ifdef LLONG_MAX
  } else if (rsize == sizeof (long long))
  {
+ long long *pr = r;
  if (LLONG_MAX < val)
  return TRUE;
- long long *pr = r;
  *pr = val;
-# endif
-# ifdef INTMAX_MAX
+#endif
+#ifdef INTMAX_MAX
  } else if (rsize == sizeof (intmax_t)) {
+ intmax_t *pr = r;
  if (INTMAX_MAX < val)
  return TRUE;
- intmax_t *pr = r;
  *pr = val;
-# endif
+#endif
  } else /* rsize == sizeof (long) */
  {
+ long *pr = r;
  if (LONG_MAX < val)
  return TRUE;
- long *pr = r;
  *pr = val;
  }
  } else {
  if (rsize == sizeof (unsigned)) {
+ unsigned *pr = r;
  if (UINT_MAX < val)
  return TRUE;
- unsigned *pr = r;
  *pr = val;
  } else if (rsize == sizeof (unsigned long)) {
+ unsigned long *pr = r;
  if (ULONG_MAX < val)
  return TRUE;
- unsigned long *pr = r;
  *pr = val;
-# ifdef ULLONG_MAX
+#ifdef ULLONG_MAX
  } else if (rsize == sizeof (unsigned long long)) {
+ long long *pr = r;
  if (ULLONG_MAX < val)
  return TRUE;
- long long *pr = r;
  *pr = val;
-# endif
+#endif
  } else /* rsize == sizeof (uintmax) */
  {
  uintmax *pr = r;