Remove tokstyle exemptions from build files.

We put some tokstyle exemptions into the source files themselves,
instead. This way we can check some of the code in those files, and more
in the future when tokstyle supports more constructs (like apidsl).

Also: hacked ping_array.api.h to not emit `_array` as parameter names.
We'll need to fix apidsl to do this better. This works for now.

1 files changed, 13 insertions, 13 deletions

diff --git a/toxcore/crypto_core_mem.c b/toxcore/crypto_core_mem.c
index b8f4223e..b8c0bd9b 100644
--- a/toxcore/crypto_core_mem.c
+++ b/toxcore/crypto_core_mem.c
@@ -37,8 +37,7 @@ void crypto_memzero(void *data, size_t length)
 {
 #ifndef VANILLA_NACL
     sodium_memzero(data, length);
-#else
-#ifdef _WIN32
+#elif defined(_WIN32)
     SecureZeroMemory(data, length);
 #elif defined(HAVE_MEMSET_S)
 
@@ -53,32 +52,33 @@ void crypto_memzero(void *data, size_t length)
 #elif defined(HAVE_EXPLICIT_BZERO)
     explicit_bzero(data, length);
 #else
-    volatile unsigned char *volatile pnt =
-        (volatile unsigned char *volatile) data;
+    //!TOKSTYLE-
+    volatile uint8_t *volatile pnt = data;
+    //!TOKSTYLE+
     size_t i = (size_t) 0U;
 
     while (i < length) {
-        pnt[i++] = 0U;
+        pnt[i] = 0U;
+        ++i;
     }
 
 #endif
-#endif
 }
 
-int32_t crypto_memcmp(const void *p1, const void *p2, size_t length)
+int32_t crypto_memcmp(const uint8_t *p1, const uint8_t *p2, size_t length)
 {
 #ifndef VANILLA_NACL
     return sodium_memcmp(p1, p2, length);
 #else
-    const volatile unsigned char *volatile b1 =
-        (const volatile unsigned char *volatile) p1;
-    const volatile unsigned char *volatile b2 =
-        (const volatile unsigned char *volatile) p2;
+    //!TOKSTYLE-
+    const volatile uint8_t *volatile b1 = p1;
+    const volatile uint8_t *volatile b2 = p2;
+    //!TOKSTYLE+
 
     size_t i;
-    unsigned char d = (unsigned char) 0U;
+    uint8_t d = (uint8_t) 0U;
 
-    for (i = 0U; i < length; i++) {
+    for (i = 0U; i < length; ++i) {
         d |= b1[i] ^ b2[i];
     }