From 777ebca319b10ccb33834cd2c1c610819164fbcd Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Thu, 10 Jun 2010 12:25:32 +0200
Subject: [PATCH] options.c: show_usage etc. aren't used elsewhere
---
src/feh.h | 2 --
src/options.c | 9 ++++++---
src/options.h | 1 -
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/feh.h b/src/feh.h
index 47f8da6..69d342f 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -100,8 +100,6 @@ enum slide_change { SLIDE_NEXT, SLIDE_PREV, SLIDE_RAND, SLIDE_FIRST, SLIDE_LAST,
typedef void (*sighandler_t) (int);
-void show_usage(void);
-void show_version(void);
int feh_main_iteration(int block);
void feh_handle_event(XEvent * ev);
void init_imlib_fonts(void);
diff --git a/src/options.c b/src/options.c
index e7524f4..be020bf 100644
--- a/src/options.c
+++ b/src/options.c
@@ -28,11 +28,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "options.h"
static void check_options(void);
+static void feh_create_default_config(char *rcfile);
static void feh_parse_option_array(int argc, char **argv);
static void feh_parse_environment_options(void);
static void feh_check_theme_options(int arg, char **argv);
static void feh_parse_options_from_string(char *opts);
static void feh_load_options_for_theme(char *theme);
+static void show_usage(void);
+static void show_version(void);
static char *theme;
fehoptions opt;
@@ -813,7 +816,7 @@ static void check_options(void)
D_RETURN_(4);
}
-void show_version(void)
+static void show_version(void)
{
printf(PACKAGE " version " VERSION "\n");
exit(0);
@@ -826,7 +829,7 @@ void show_mini_usage(void)
exit(1);
}
-void show_usage(void)
+static void show_usage(void)
{
fprintf(stdout,
"Usage : " PACKAGE " [OPTIONS]... FILES...\n"
@@ -1160,7 +1163,7 @@ void show_usage(void)
exit(0);
}
-void feh_create_default_config(char *rcfile)
+static void feh_create_default_config(char *rcfile)
{
FILE *fp;
diff --git a/src/options.h b/src/options.h
index 5d11816..4d15bac 100644
--- a/src/options.h
+++ b/src/options.h
@@ -132,7 +132,6 @@ struct __fehoptions {
void init_parse_options(int argc, char **argv);
char *feh_string_normalize(char *str);
-void feh_create_default_config(char *rcfile);
extern fehoptions opt;
--
GitLab