(inittables): Use `sizeof *var' rather than `sizeof EXPLICIT_TYPE'.

The former is more maintainable and usually shorter.
(sort): Split a long line.

diff --git a/src/sort.c b/src/sort.c
index f2268f1dffe0b106fd44f127a06e3b15c622634c..735be385437f203f1cdcb4bb846753ae67232d53 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -573,7 +573,7 @@ inittables (void)
          name[j] = '\0';
        }
       qsort ((void *) monthtab, MONTHS_PER_YEAR,
-            sizeof (struct month), struct_month_cmp);
+            sizeof *monthtab, struct_month_cmp);
     }
 #endif
 }
@@ -1992,7 +1992,8 @@ sort (char * const *files, int nfiles, char const *output_file)
       char const *file = *files;
       FILE *fp = xfopen (file, "r");
       FILE *tfp;
-      size_t bytes_per_line = 2 * sizeof (struct line) - sizeof (struct line) / 2;
+      size_t bytes_per_line = (2 * sizeof (struct line)
+                              - sizeof (struct line) / 2);
 
       if (! buf.alloc)
        initbuf (&buf, bytes_per_line,