From 4c7d221a176e51aa2529e4e98d536ec2a504e7ae Mon Sep 17 00:00:00 2001 From: javalsai Date: Wed, 25 Dec 2024 20:00:09 +0100 Subject: [PATCH] dev: use `#include`s according to error's concerns --- include/auth.h | 4 ++-- include/config.h | 6 ++---- include/sessions.h | 2 +- include/ui.h | 4 ++-- include/users.h | 2 +- include/util.h | 8 ++++---- src/auth.c | 12 ++++++------ src/chvt.c | 2 +- src/config.c | 4 ++-- src/efield.c | 4 ++-- src/main.c | 12 ++++++------ src/sessions.c | 4 ++-- src/ui.c | 12 ++++++------ src/users.c | 4 ++-- src/util.c | 6 +++--- 15 files changed, 42 insertions(+), 44 deletions(-) diff --git a/include/auth.h b/include/auth.h index f3912ee..b456227 100644 --- a/include/auth.h +++ b/include/auth.h @@ -3,8 +3,8 @@ #include -#include -#include +#include "config.h" +#include "sessions.h" bool launch(char *user, char *passwd, struct session session, void (*cb)(void), struct behavior* behavior); diff --git a/include/config.h b/include/config.h index 1ae2bcf..a9fa05d 100644 --- a/include/config.h +++ b/include/config.h @@ -1,13 +1,11 @@ #ifndef _CONFIGH_ #define _CONFIGH_ -#include "util.h" #include #include -#include -#include -#include +#include "keys.h" +#include "util.h" // should be ansi escape codes under \x1b[...m // if not prepared accordingly, it might break diff --git a/include/sessions.h b/include/sessions.h index 1019410..c632a88 100644 --- a/include/sessions.h +++ b/include/sessions.h @@ -3,7 +3,7 @@ #include -#include +#include "util.h" enum session_type { XORG, diff --git a/include/ui.h b/include/ui.h index c6bb884..023a947 100644 --- a/include/ui.h +++ b/include/ui.h @@ -1,8 +1,8 @@ #ifndef _UIH_ #define _UIH_ -#include -#include +#include "config.h" +#include "util.h" void setup(struct config); int load(struct Vector * users, struct Vector * sessions); diff --git a/include/users.h b/include/users.h index 60fac69..8344833 100644 --- a/include/users.h +++ b/include/users.h @@ -3,7 +3,7 @@ #include -#include +#include "util.h" struct user { char *shell; diff --git a/include/util.h b/include/util.h index be9bdce..f92c59c 100644 --- a/include/util.h +++ b/include/util.h @@ -1,10 +1,10 @@ #ifndef _UTILH_ #define _UTILH_ -#include -#include -#include -#include +#include "keys.h" +#include "stdbool.h" +#include "stdint.h" +#include "sys/types.h" enum keys find_keyname(char *); enum keys find_ansi(char *); diff --git a/src/auth.c b/src/auth.c index a0459bc..11819e8 100644 --- a/src/auth.c +++ b/src/auth.c @@ -1,4 +1,3 @@ -#include "config.h" #include #include #include @@ -9,11 +8,12 @@ #include #include -#include -#include -#include -#include -#include +#include "auth.h" +#include "config.h" +#include "sessions.h" +#include "ui.h" +#include "unistd.h" +#include "util.h" int pam_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr) { diff --git a/src/chvt.c b/src/chvt.c index 8445ca7..a78090b 100644 --- a/src/chvt.c +++ b/src/chvt.c @@ -3,7 +3,7 @@ #include #include -#include +#include "chvt.h" static char *vterms[] = {"/dev/tty", "/dev/tty0", "/dev/vc/0", "/dev/systty", "/dev/console"}; diff --git a/src/config.c b/src/config.c index 143d3d4..fed2461 100644 --- a/src/config.c +++ b/src/config.c @@ -1,8 +1,8 @@ -#include "util.h" #include #include -#include +#include "config.h" +#include "util.h" bool line_parser(FILE *fd, ssize_t *blksize, u_char (*cb)(char *key, char *value)) { diff --git a/src/efield.c b/src/efield.c index daa798c..c76b2e7 100644 --- a/src/efield.c +++ b/src/efield.c @@ -1,7 +1,7 @@ #include -#include -#include +#include "efield.h" +#include "ui.h" struct editable_field field_new(char *content) { struct editable_field __efield; diff --git a/src/main.c b/src/main.c index a5f0425..dec1037 100644 --- a/src/main.c +++ b/src/main.c @@ -4,12 +4,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "chvt.h" +#include "config.h" +#include "sessions.h" +#include "ui.h" +#include "users.h" +#include "util.h" int main(int argc, char *argv[]) { if (argc == 2) diff --git a/src/sessions.c b/src/sessions.c index 8ea36b9..e327f4f 100644 --- a/src/sessions.c +++ b/src/sessions.c @@ -7,8 +7,8 @@ #include #include -#include -#include +#include "sessions.h" +#include "util.h" struct source_dir { enum session_type type; diff --git a/src/ui.c b/src/ui.c index a7e1275..88cd854 100644 --- a/src/ui.c +++ b/src/ui.c @@ -16,12 +16,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "auth.h" +#include "efield.h" +#include "keys.h" +#include "sessions.h" +#include "ui.h" +#include "util.h" static void print_box(); static void print_footer(); diff --git a/src/users.c b/src/users.c index e86bff5..67049a8 100644 --- a/src/users.c +++ b/src/users.c @@ -5,8 +5,8 @@ #include #include -#include -#include +#include "users.h" +#include "util.h" static struct user __new_user(struct passwd *p) { struct user __user; diff --git a/src/util.c b/src/util.c index 877ddd7..b6cdb4a 100644 --- a/src/util.c +++ b/src/util.c @@ -5,9 +5,9 @@ #include #include -#include -#include -#include +#include "keys.h" +#include "ui.h" +#include "util.h" static int selret_magic();