summaryrefslogtreecommitdiff
path: root/toxav
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2020-04-09 23:56:19 +0000
committeriphydf <iphydf@users.noreply.github.com>2020-04-16 11:05:08 +0000
commitc08b2fb3e2c3c8e8a5722e7350b61efd6992be45 (patch)
treebc6f5738bb6a948146cedb612cc12abb3e158fb4 /toxav
parent7f9f8045cd6f8d92559cdc9f7d297cf92e960e49 (diff)
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.
Diffstat (limited to 'toxav')
-rw-r--r--toxav/BUILD.bazel7
-rw-r--r--toxav/toxav.api.h4
-rw-r--r--toxav/toxav.h4
3 files changed, 10 insertions, 5 deletions
diff --git a/toxav/BUILD.bazel b/toxav/BUILD.bazel
index 33956aac..036bde3f 100644
--- a/toxav/BUILD.bazel
+++ b/toxav/BUILD.bazel
@@ -45,8 +45,8 @@ cc_library(
45 hdrs = ["bwcontroller.h"], 45 hdrs = ["bwcontroller.h"],
46 deps = [ 46 deps = [
47 ":ring_buffer", 47 ":ring_buffer",
48 "//c-toxcore/toxcore",
48 "//c-toxcore/toxcore:Messenger", 49 "//c-toxcore/toxcore:Messenger",
49 "//c-toxcore/toxcore:toxcore",
50 ], 50 ],
51) 51)
52 52
@@ -130,10 +130,7 @@ CIMPLE_SRCS = glob(
130 "*.c", 130 "*.c",
131 "*.h", 131 "*.h",
132 ], 132 ],
133 exclude = [ 133 exclude = ["*.api.h"],
134 "*.api.h",
135 "toxav.h",
136 ],
137) 134)
138 135
139sh_test( 136sh_test(
diff --git a/toxav/toxav.api.h b/toxav/toxav.api.h
index 158f74e6..269fd3d7 100644
--- a/toxav/toxav.api.h
+++ b/toxav/toxav.api.h
@@ -10,6 +10,8 @@
10#include <stddef.h> 10#include <stddef.h>
11#include <stdint.h> 11#include <stdint.h>
12 12
13//!TOKSTYLE-
14
13#ifdef __cplusplus 15#ifdef __cplusplus
14extern "C" { 16extern "C" {
15#endif 17#endif
@@ -686,5 +688,7 @@ typedef TOXAV_ERR_BIT_RATE_SET Toxav_Err_Bit_Rate_Set;
686typedef TOXAV_ERR_SEND_FRAME Toxav_Err_Send_Frame; 688typedef TOXAV_ERR_SEND_FRAME Toxav_Err_Send_Frame;
687typedef TOXAV_CALL_CONTROL Toxav_Call_Control; 689typedef TOXAV_CALL_CONTROL Toxav_Call_Control;
688 690
691//!TOKSTYLE+
692
689#endif // C_TOXCORE_TOXAV_TOXAV_H 693#endif // C_TOXCORE_TOXAV_TOXAV_H
690%} 694%}
diff --git a/toxav/toxav.h b/toxav/toxav.h
index 141ccb89..a96c85cb 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -9,6 +9,8 @@
9#include <stddef.h> 9#include <stddef.h>
10#include <stdint.h> 10#include <stdint.h>
11 11
12//!TOKSTYLE-
13
12#ifdef __cplusplus 14#ifdef __cplusplus
13extern "C" { 15extern "C" {
14#endif 16#endif
@@ -815,4 +817,6 @@ typedef TOXAV_ERR_BIT_RATE_SET Toxav_Err_Bit_Rate_Set;
815typedef TOXAV_ERR_SEND_FRAME Toxav_Err_Send_Frame; 817typedef TOXAV_ERR_SEND_FRAME Toxav_Err_Send_Frame;
816typedef TOXAV_CALL_CONTROL Toxav_Call_Control; 818typedef TOXAV_CALL_CONTROL Toxav_Call_Control;
817 819
820//!TOKSTYLE+
821
818#endif // C_TOXCORE_TOXAV_TOXAV_H 822#endif // C_TOXCORE_TOXAV_TOXAV_H