refactor: rename struct args into struct config

Signed-off-by: Leonardo Di Donato <[email protected]>
leodido · Jun 1, 2022 · f4e70fd · f4e70fd
1 parent 3095206
commit f4e70fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/api/api.$progname.h.in b/api/api.$progname.h.in
@@ -1,7 +1,7 @@
 #include "${PROGNAME}.skel.h"
 
 #include <errno.h>
-int ${OPERATION}${PROGNAME}(struct args *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb)
+int ${OPERATION}${PROGNAME}(struct config *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb)
 {
     int err;
     char buf[100];

diff --git a/api/api.h.in b/api/api.h.in
@@ -17,7 +17,7 @@ enum program {${PROGRAMS_AS_SYMBOLS}};
 
 typedef enum program program_t;
 
-struct args
+struct config
 {
     bool verbose;
     char ifname[IF_NAMESIZE];
@@ -35,7 +35,7 @@ typedef int (*bpf_obj_fn_t)(void *obj);
 
 typedef int (*after_attach_fn_t)(struct bpf_tc_hook hook, struct bpf_tc_opts opts);
 
-typedef int (*attach_fn_t)(struct args *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb);
+typedef int (*attach_fn_t)(struct config *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb);
 
 /// logging
 int print_log(FILE *f, bool verbosity, bool prefix, const char *fmt, va_list argptr)
@@ -55,15 +55,15 @@ int print_log(FILE *f, bool verbosity, bool prefix, const char *fmt, va_list arg
     return res;
 }
 
-void log_err(struct args *cfg, const char *fmt, ...)
+void log_err(struct config *cfg, const char *fmt, ...)
 {
     va_list argptr;
     va_start(argptr, fmt);
     print_log(cfg->err_stream, cfg->verbose, true, fmt, argptr);
     va_end(argptr);
 }
 
-void log_out(struct args *cfg, const char *fmt, ...)
+void log_out(struct config *cfg, const char *fmt, ...)
 {
     va_list argptr;
     va_start(argptr, fmt);
@@ -88,7 +88,7 @@ ${API}
 /// dispatch
 attach_fn_t attach_fn[NUM_PROGRAMS] = { ${PROGRAMS_OPS_AS_SYMBOLS} };
 
-int attach(struct args *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb)
+int attach(struct config *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb)
 {
     attach_fn_t fn = attach_fn[conf->program];
     if (fn) {

diff --git a/traffico-cni.c b/traffico-cni.c
@@ -105,7 +105,7 @@ int add_command()
     err.msg = "";
     err.details = "";
 
-    struct args config = {
+    struct config config = {
         .verbose = false,
         .cleanup_on_exit = false,
     };

diff --git a/traffico.c b/traffico.c
@@ -37,7 +37,7 @@ const struct argp_option argp_opts[] = {
 
 };
 
-static struct args g_config;
+static struct config g_config;
 
 #define log_erro(fmt, ...) \
     log_err(&g_config, fmt, ##__VA_ARGS__);