astyle

2024-11-22 07:35:38 +00:00 · 2020-09-15 17:23:57 -04:00 · 2020-09-15 17:23:57 -04:00 · 6154c0d7d3
--- a/crypto_kem/frodokem1344aes/clean/util.c
+++ b/crypto_kem/frodokem1344aes/clean/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM1344AES_CLEAN_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem1344aes/opt/util.c
+++ b/crypto_kem/frodokem1344aes/opt/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM1344AES_OPT_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem1344shake/clean/util.c
+++ b/crypto_kem/frodokem1344shake/clean/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM1344SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem1344shake/opt/util.c
+++ b/crypto_kem/frodokem1344shake/opt/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM1344SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem640aes/clean/util.c
+++ b/crypto_kem/frodokem640aes/clean/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM640AES_CLEAN_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem640aes/opt/util.c
+++ b/crypto_kem/frodokem640aes/opt/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM640AES_OPT_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem640shake/clean/util.c
+++ b/crypto_kem/frodokem640shake/clean/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM640SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem640shake/opt/util.c
+++ b/crypto_kem/frodokem640shake/opt/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM640SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem976aes/clean/util.c
+++ b/crypto_kem/frodokem976aes/clean/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM976AES_CLEAN_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem976aes/opt/util.c
+++ b/crypto_kem/frodokem976aes/opt/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM976AES_OPT_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem976shake/clean/util.c
+++ b/crypto_kem/frodokem976shake/clean/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM976SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/frodokem976shake/opt/util.c
+++ b/crypto_kem/frodokem976shake/opt/util.c
@ -12,8 +12,10 @@
 #include "params.h"

 static inline uint8_t min(uint8_t x, uint8_t y) {
-  if (x < y) return x;
-  return y;
+    if (x < y) {
+        return x;
+    }
+    return y;
 }

 uint16_t PQCLEAN_FRODOKEM976SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
--- a/crypto_kem/mceliece348864/avx/int32_sort.c
+++ b/crypto_kem/mceliece348864/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece348864f/avx/int32_sort.c
+++ b/crypto_kem/mceliece348864f/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece460896/avx/int32_sort.c
+++ b/crypto_kem/mceliece460896/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece460896f/avx/int32_sort.c
+++ b/crypto_kem/mceliece460896f/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece6688128/avx/int32_sort.c
+++ b/crypto_kem/mceliece6688128/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece6688128f/avx/int32_sort.c
+++ b/crypto_kem/mceliece6688128f/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece6960119/avx/int32_sort.c
+++ b/crypto_kem/mceliece6960119/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece6960119f/avx/int32_sort.c
+++ b/crypto_kem/mceliece6960119f/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece8192128/avx/int32_sort.c
+++ b/crypto_kem/mceliece8192128/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/mceliece8192128f/avx/int32_sort.c
+++ b/crypto_kem/mceliece8192128f/avx/int32_sort.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, size_t n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/ntrulpr653/avx2/crypto_sort_int32.c
+++ b/crypto_kem/ntrulpr653/avx2/crypto_sort_int32.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/ntrulpr761/avx2/crypto_sort_int32.c
+++ b/crypto_kem/ntrulpr761/avx2/crypto_sort_int32.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/ntrulpr857/avx2/crypto_sort_int32.c
+++ b/crypto_kem/ntrulpr857/avx2/crypto_sort_int32.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/sntrup653/avx2/crypto_sort_int32.c
+++ b/crypto_kem/sntrup653/avx2/crypto_sort_int32.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/sntrup761/avx2/crypto_sort_int32.c
+++ b/crypto_kem/sntrup761/avx2/crypto_sort_int32.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {
--- a/crypto_kem/sntrup857/avx2/crypto_sort_int32.c
+++ b/crypto_kem/sntrup857/avx2/crypto_sort_int32.c
@ -463,8 +463,10 @@ static void int32_sort_2power(int32 *x, long long n, int flagdown) {

            q = n >> 3;
            flip = 0;
-            if (p << 1 == q) flip = 1;
-            flipflip = 1-flip;
+            if (p << 1 == q) {
+                flip = 1;
+            }
+            flipflip = 1 - flip;
            for (j = 0; j < q; j += p + p) {
                for (k = j; k < j + p + p; k += p) {
                    for (i = k; i < k + p; i += 8) {