diff --git a/include/sessions.h b/include/sessions.h index 209642b..06118d7 100644 --- a/include/sessions.h +++ b/include/sessions.h @@ -19,27 +19,27 @@ enum ExecType { }; struct desktop_exec { - char** args; + char* NULLABLE* NNULLABLE args; int arg_count; }; struct session_exec { enum ExecType typ; union { - char* shell; + char* NNULLABLE shell; struct desktop_exec desktop; }; }; -static inline struct session_exec session_exec_shell(char* shell) { +static inline struct session_exec session_exec_shell(char* NNULLABLE shell) { return (struct session_exec){ .typ = EXEC_SHELL, .shell = shell, }; } -static inline struct session_exec session_exec_desktop(int arg_count, - char** args) { +static inline struct session_exec session_exec_desktop( + int arg_count, char* NULLABLE* NNULLABLE args) { return (struct session_exec){ .typ = EXEC_DESKTOP, .desktop = @@ -50,8 +50,8 @@ static inline struct session_exec session_exec_desktop(int arg_count, }; } -static inline int session_exec_exec(struct session_exec* exec, - char** NNULLABLE envlist) { +static inline int session_exec_exec(struct session_exec* NNULLABLE exec, + char* NULLABLE* NNULLABLE envlist) { switch (exec->typ) { case EXEC_SHELL: return execle(exec->shell, exec->shell, NULL, envlist); diff --git a/src/auth.c b/src/auth.c index 8677727..00ab01a 100644 --- a/src/auth.c +++ b/src/auth.c @@ -19,7 +19,7 @@ #include "util.h" static void try_source_file(struct Vector* NNULLABLE vec_envlist, - char* NNULLABLE filepath) { + char* NNULLABLE filepath) { log_printf("sourcing %s\n", filepath); FILE* file2source = fopen(filepath, "r"); if (file2source == NULL) { @@ -49,9 +49,9 @@ static void try_source_file(struct Vector* NNULLABLE vec_envlist, } static void source_paths(struct Vector* NNULLABLE vec_envlist, - struct Vector* NNULLABLE abs_source, - const char* NULLABLE user_home, - struct Vector* NNULLABLE user_source) { + struct Vector* NNULLABLE abs_source, + const char* NULLABLE user_home, + struct Vector* NNULLABLE user_source) { for (size_t i = 0; i < abs_source->length; i++) { char* path = vec_get(abs_source, i); try_source_file(vec_envlist, path);