Fix GCC declaration-after-statement error

Since upgrading to Linux v5.18 in Nixpkgs, we've been seeing an "ISO C90 forbids mixed declarations and code" error from GCC. This patch fixes it by initializing regs as part of its declaration, meaning hook will no longer be declared after a statement. Signed-off-by: Alyssa Ross <[email protected]>
gnif · Sep 29, 2022 · 4b466e9 · 4b466e9
1 parent e65b850
commit 4b466e9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/ftrace.c b/src/ftrace.c
@@ -55,8 +55,7 @@ static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, st
 #else
 static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs)
 {
-  struct pt_regs *regs;
-  regs = ftrace_get_regs(fregs);
+  struct pt_regs *regs = ftrace_get_regs(fregs);
 #endif
   struct ftrace_hook *hook = to_ftrace_hook(ops);