Fix tidy errors

Silence some warnings about `fprintf` vs. `fprintf_s` (which is not available).
IndianBoy42 · Jun 24, 2024 · d0c2ab1 · d0c2ab1
1 parent f78090e
commit d0c2ab1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -2,3 +2,4 @@ Checks: "clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,modernize-*,-mo
 WarningsAsErrors: true
 HeaderFilterRegex: ""
 FormatStyle: google
+ExtraArgsBefore: ["--std=c11"]
diff --git a/justfile b/justfile
@@ -85,7 +85,7 @@ _lint-min: _clone-repo-tree-sitter configure-compile-database
 	git ls-files '**.c' | \
 		grep -v 'parser\.c' | \
 		grep -v 'bindings/python' | \
-		xargs -IFNAME sh -c 'echo "\nchecking file FNAME" && clang-tidy --std=c11 FNAME'
+		xargs -IFNAME sh -c 'echo "\nchecking file FNAME" && clang-tidy FNAME'
 
 # Run the linter for JS, C, Cargo, and Python. Requires clang-tidy, clippy, and ruff.
 lint: _lint-min

diff --git a/src/scanner.c b/src/scanner.c
@@ -22,21 +22,25 @@
 #define unused_attr
 #endif
 
+#ifndef fprintf_s
+#define fprintf_s fprintf // NOLINT
+#endif
+
 #ifdef DEBUG_PRINT
 #define dbg_print(...)                                                         \
   do {                                                                         \
-    fprintf_s(stderr, "    \033[96;1mparse: \033[0m");                           \
-    fprintf_s(stderr, __VA_ARGS__);                                              \
+    fprintf_s(stderr, "    \033[96;1mparse: \033[0m");                         \
+    fprintf_s(stderr, __VA_ARGS__);                                            \
   } while (0)
 #else
 #define dbg_print(...)
 #endif
 
 #define panic(...)                                                             \
   do {                                                                         \
-    fprintf_s(stderr, "panic at %s:%d: ", __FILE_NAME__, __LINE__);              \
-    fprintf_s(stderr, __VA_ARGS__);                                              \
-    fprintf_s(stderr, "\n");                                                     \
+    fprintf_s(stderr, "panic at %s:%d: ", __FILE_NAME__, __LINE__);            \
+    fprintf_s(stderr, __VA_ARGS__);                                            \
+    fprintf_s(stderr, "\n");                                                   \
     exit(1);                                                                   \
   } while (0);