From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 19 Feb 2025 04:09:10 +0000 (-0800)
Subject: cksum: check API better
X-Git-Tag: v9.7~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ed8b6f9de619a04aa2f2c8fa6f58f6459d22786;p=thirdparty%2Fcoreutils.git

cksum: check API better

* src/cksum_avx2.c, src/cksum_avx512.c, src/cksum_pclmul.c:
* src/cksum_vmull.c:
Include cksum.h instead of copying its decls/includes by hand.
This is a better way to ensure consistency among defns and uses.
---

diff --git a/src/cksum_avx2.c b/src/cksum_avx2.c
index 7fbc83d5bb..b50a5de1a9 100644
--- a/src/cksum_avx2.c
+++ b/src/cksum_avx2.c
@@ -16,20 +16,16 @@
 
 #include <config.h>
 
+#include "cksum.h"
+
 #include <stdio.h>
 #include <sys/types.h>
-#include <stdint.h>
 #include <x86intrin.h>
 #include "system.h"
 
 /* Number of bytes to read at once.  */
 #define BUFLEN (1 << 16)
 
-extern uint_fast32_t const crctab[8][256];
-
-extern bool
-cksum_avx2 (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out);
-
 bool
 cksum_avx2 (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out)
 {
diff --git a/src/cksum_avx512.c b/src/cksum_avx512.c
index b2cef2824f..e62c3e3ac1 100644
--- a/src/cksum_avx512.c
+++ b/src/cksum_avx512.c
@@ -16,20 +16,15 @@
 
 #include <config.h>
 
-#include <stdio.h>
+#include "cksum.h"
+
 #include <sys/types.h>
-#include <stdint.h>
 #include <x86intrin.h>
 #include "system.h"
 
 /* Number of bytes to read at once.  */
 #define BUFLEN (1 << 16)
 
-extern uint_fast32_t const crctab[8][256];
-
-extern bool
-cksum_avx512 (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out);
-
 bool
 cksum_avx512 (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out)
 {
diff --git a/src/cksum_pclmul.c b/src/cksum_pclmul.c
index 5806556b63..c47bb9f849 100644
--- a/src/cksum_pclmul.c
+++ b/src/cksum_pclmul.c
@@ -16,20 +16,16 @@
 
 #include <config.h>
 
+#include "cksum.h"
+
 #include <stdio.h>
 #include <sys/types.h>
-#include <stdint.h>
 #include <x86intrin.h>
 #include "system.h"
 
 /* Number of bytes to read at once.  */
 #define BUFLEN (1 << 16)
 
-extern uint_fast32_t const crctab[8][256];
-
-extern bool
-cksum_pclmul (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out);
-
 /* Calculate CRC32 using PCLMULQDQ CPU instruction found in x86/x64 CPUs */
 
 bool
diff --git a/src/cksum_vmull.c b/src/cksum_vmull.c
index 0ff81e225d..fb3b6dcdd4 100644
--- a/src/cksum_vmull.c
+++ b/src/cksum_vmull.c
@@ -16,20 +16,16 @@
 
 #include <config.h>
 
+#include "cksum.h"
+
 #include <stdio.h>
 #include <sys/types.h>
-#include <stdint.h>
 #include <arm_neon.h>
 #include "system.h"
 
 /* Number of bytes to read at once.  */
 #define BUFLEN (1 << 16)
 
-extern uint_fast32_t const crctab[8][256];
-
-extern bool
-cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out);
-
 static uint64x2_t
 bswap_neon (uint64x2_t in)
 {
@@ -92,7 +88,6 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out)
           data = bswap_neon (data);
           /* XOR in initial CRC value (for us 0 so no effect), or CRC value
              calculated for previous BUFLEN buffer from fread */
-
           uint64_t wcrc = crc;
           xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32));
           crc = 0;