From ecb71f25501bc78efdaaa2535e95a58d11e09e5a Mon Sep 17 00:00:00 2001 From: Yorhel <git@yorhel.nl> Date: Sat, 25 Jan 2020 09:25:08 +0100 Subject: [PATCH] Fix definitions of global vars `confirm_quit` and `dir_process` They were defined (rather than just declared) in .h files, when they really should be defined in at most a single .c file. Fixes #140. --- src/browser.h | 1 - src/dir.h | 2 +- src/dir_common.c | 1 + src/main.c | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/browser.h b/src/browser.h index 41a44e6..e748cd2 100644 --- a/src/browser.h +++ b/src/browser.h @@ -28,7 +28,6 @@ #include "global.h" -int confirm_quit; int browse_key(int); void browse_draw(void); void browse_init(struct dir *); diff --git a/src/dir.h b/src/dir.h index 0b7bf36..3221c45 100644 --- a/src/dir.h +++ b/src/dir.h @@ -103,7 +103,7 @@ int dir_export_init(const char *fn); /* Function set by input code. Returns dir_output.final(). */ -int (*dir_process)(); +extern int (*dir_process)(); /* Scanning a live directory */ extern int dir_scan_smfs; diff --git a/src/dir_common.c b/src/dir_common.c index f17fa2c..284a981 100644 --- a/src/dir_common.c +++ b/src/dir_common.c @@ -31,6 +31,7 @@ #include <stdarg.h> +int (*dir_process)(); char *dir_curpath; /* Full path of the last seen item. */ struct dir_output dir_output; char *dir_fatalerr; /* Error message on a fatal error. (NULL if there was no fatal error) */ diff --git a/src/main.c b/src/main.c index 6ce951d..982e337 100644 --- a/src/main.c +++ b/src/main.c @@ -42,6 +42,7 @@ long update_delay = 100; int cachedir_tags = 0; int extended_info = 0; int follow_symlinks = 0; +int confirm_quit = 0; static int min_rows = 17, min_cols = 60; static int ncurses_init = 0; -- GitLab