From: Vladislav Shchapov <vladislav@shchapov.ru>
Date: Sat, 18 Feb 2023 09:18:18 +0000 (+0500)
Subject: Fix formatting
X-Git-Tag: 2.1.0-beta1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330f2ffb3f66dea60c9e7a5610de0d9cc5b576fb;p=thirdparty%2Fzlib-ng.git

Fix formatting

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
---

diff --git a/arch/x86/crc32_fold_pclmulqdq_tpl.h b/arch/x86/crc32_fold_pclmulqdq_tpl.h
index da1810bf7..3e7992831 100644
--- a/arch/x86/crc32_fold_pclmulqdq_tpl.h
+++ b/arch/x86/crc32_fold_pclmulqdq_tpl.h
@@ -18,9 +18,9 @@
  */
 
 #ifdef COPY
-Z_INTERNAL void CRC32_FOLD_COPY_NAME (crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len) {
+Z_INTERNAL void CRC32_FOLD_COPY(crc32_fold *crc, uint8_t *dst, const uint8_t *src, size_t len) {
 #else
-Z_INTERNAL void CRC32_FOLD_NAME (crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc) {
+Z_INTERNAL void CRC32_FOLD(crc32_fold *crc, const uint8_t *src, size_t len, uint32_t init_crc) {
 #endif
     unsigned long algn_diff;
     __m128i xmm_t0, xmm_t1, xmm_t2, xmm_t3;
diff --git a/arch/x86/crc32_pclmulqdq.c b/arch/x86/crc32_pclmulqdq.c
index b4cdeb360..9383b7a2b 100644
--- a/arch/x86/crc32_pclmulqdq.c
+++ b/arch/x86/crc32_pclmulqdq.c
@@ -19,11 +19,11 @@
 
 #ifdef X86_PCLMULQDQ_CRC
 
-#define CRC32_FOLD_COPY_NAME  crc32_fold_pclmulqdq_copy
-#define CRC32_FOLD_NAME       crc32_fold_pclmulqdq
-#define CRC32_FOLD_RESET_NAME crc32_fold_pclmulqdq_reset
-#define CRC32_FOLD_FINAL_NAME crc32_fold_pclmulqdq_final
-#define CRC32_NAME            crc32_pclmulqdq
+#define CRC32_FOLD_COPY  crc32_fold_pclmulqdq_copy
+#define CRC32_FOLD       crc32_fold_pclmulqdq
+#define CRC32_FOLD_RESET crc32_fold_pclmulqdq_reset
+#define CRC32_FOLD_FINAL crc32_fold_pclmulqdq_final
+#define CRC32            crc32_pclmulqdq
 
 #include "crc32_pclmulqdq_tpl.h"
 
diff --git a/arch/x86/crc32_pclmulqdq_tpl.h b/arch/x86/crc32_pclmulqdq_tpl.h
index 6726e3491..04dad4b60 100644
--- a/arch/x86/crc32_pclmulqdq_tpl.h
+++ b/arch/x86/crc32_pclmulqdq_tpl.h
@@ -23,7 +23,7 @@
 #include <wmmintrin.h>
 #include <smmintrin.h> // _mm_extract_epi32
 #ifdef X86_VPCLMULQDQ
-#include <immintrin.h>
+#  include <immintrin.h>
 #endif
 
 #include "../../crc32_fold.h"
@@ -187,7 +187,6 @@ static const unsigned ALIGNED_(32) pshufb_shf_table[60] = {
 
 static void partial_fold(const size_t len, __m128i *xmm_crc0, __m128i *xmm_crc1, __m128i *xmm_crc2,
                          __m128i *xmm_crc3, __m128i *xmm_crc_part) {
-
     const __m128i xmm_fold4 = _mm_set_epi32( 0x00000001, 0x54442bd4,
                                              0x00000001, 0xc6e41596);
     const __m128i xmm_mask3 = _mm_set1_epi32((int32_t)0x80808080);
@@ -246,26 +245,26 @@ static inline void crc32_fold_save(__m128i *fold, const __m128i *fold0, const __
     _mm_storeu_si128(fold + 3, *fold3);
 }
 
-Z_INTERNAL uint32_t CRC32_FOLD_RESET_NAME (crc32_fold *crc) {
+Z_INTERNAL uint32_t CRC32_FOLD_RESET(crc32_fold *crc) {
     __m128i xmm_crc0 = _mm_cvtsi32_si128(0x9db42487);
     __m128i xmm_zero = _mm_setzero_si128();
     crc32_fold_save((__m128i *)crc->fold, &xmm_crc0, &xmm_zero, &xmm_zero, &xmm_zero);
     return 0;
 }
 
-#define ONCE(op)               if (first) { first = 0; op; }
-#define XOR_INITIAL128(where)  ONCE(where = _mm_xor_si128(where, xmm_initial))
+#define ONCE(op)                 if (first) { first = 0; op; }
+#define XOR_INITIAL128(where)    ONCE(where = _mm_xor_si128(where, xmm_initial))
 #ifdef X86_VPCLMULQDQ
-#define XOR_INITIAL512(where)  ONCE(where = _mm512_xor_si512(where, zmm_initial))
+#  define XOR_INITIAL512(where)  ONCE(where = _mm512_xor_si512(where, zmm_initial))
 #endif
 
 #ifdef X86_VPCLMULQDQ
-#include "crc32_fold_vpclmulqdq_tpl.h"
+#  include "crc32_fold_vpclmulqdq_tpl.h"
 #endif
 #include "crc32_fold_pclmulqdq_tpl.h"
 #define COPY
 #ifdef X86_VPCLMULQDQ
-#include "crc32_fold_vpclmulqdq_tpl.h"
+#  include "crc32_fold_vpclmulqdq_tpl.h"
 #endif
 #include "crc32_fold_pclmulqdq_tpl.h"
 
@@ -286,7 +285,7 @@ static const unsigned ALIGNED_(16) crc_mask2[4] = {
     0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
 };
 
-Z_INTERNAL uint32_t CRC32_FOLD_FINAL_NAME (crc32_fold *crc) {
+Z_INTERNAL uint32_t CRC32_FOLD_FINAL(crc32_fold *crc) {
     const __m128i xmm_mask  = _mm_load_si128((__m128i *)crc_mask);
     const __m128i xmm_mask2 = _mm_load_si128((__m128i *)crc_mask2);
     __m128i xmm_crc0, xmm_crc1, xmm_crc2, xmm_crc3;
@@ -351,14 +350,14 @@ Z_INTERNAL uint32_t CRC32_FOLD_FINAL_NAME (crc32_fold *crc) {
     return crc->value;
 }
 
-Z_INTERNAL uint32_t CRC32_NAME (uint32_t crc32, const uint8_t *buf, size_t len) {
+Z_INTERNAL uint32_t CRC32(uint32_t crc32, const uint8_t *buf, size_t len) {
     /* For lens < 64, crc32_braid method is faster. The CRC32 instruction for
      * these short lengths might also prove to be effective */
     if (len < 64)
         return PREFIX(crc32_braid)(crc32, buf, len);
 
     crc32_fold ALIGNED_(16) crc_state;
-    CRC32_FOLD_RESET_NAME (&crc_state);
-    CRC32_FOLD_NAME (&crc_state, buf, len, crc32);
-    return CRC32_FOLD_FINAL_NAME (&crc_state);
+    CRC32_FOLD_RESET(&crc_state);
+    CRC32_FOLD(&crc_state, buf, len, crc32);
+    return CRC32_FOLD_FINAL(&crc_state);
 }
diff --git a/arch/x86/crc32_vpclmulqdq.c b/arch/x86/crc32_vpclmulqdq.c
index b05ddb9a2..ec641b432 100644
--- a/arch/x86/crc32_vpclmulqdq.c
+++ b/arch/x86/crc32_vpclmulqdq.c
@@ -6,11 +6,11 @@
 #if defined(X86_PCLMULQDQ_CRC) && defined(X86_VPCLMULQDQ_CRC)
 
 #define X86_VPCLMULQDQ
-#define CRC32_FOLD_COPY_NAME  crc32_fold_vpclmulqdq_copy
-#define CRC32_FOLD_NAME       crc32_fold_vpclmulqdq
-#define CRC32_FOLD_RESET_NAME crc32_fold_vpclmulqdq_reset
-#define CRC32_FOLD_FINAL_NAME crc32_fold_vpclmulqdq_final
-#define CRC32_NAME            crc32_vpclmulqdq
+#define CRC32_FOLD_COPY  crc32_fold_vpclmulqdq_copy
+#define CRC32_FOLD       crc32_fold_vpclmulqdq
+#define CRC32_FOLD_RESET crc32_fold_vpclmulqdq_reset
+#define CRC32_FOLD_FINAL crc32_fold_vpclmulqdq_final
+#define CRC32            crc32_vpclmulqdq
 
 #include "crc32_pclmulqdq_tpl.h"