From 85f740c233e99e970589318f13aca87eb0b7fe39 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Wed, 11 May 2016 11:26:47 +0200 Subject: [PATCH] cat: declare static variables and fix several compiler warnings --- cat/bsdcat.c | 12 ++++++------ cat/bsdcat.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cat/bsdcat.c b/cat/bsdcat.c index af140e000..9ef75a6b4 100644 --- a/cat/bsdcat.c +++ b/cat/bsdcat.c @@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$"); #define BYTES_PER_BLOCK (20*512) -struct archive *a; -struct archive_entry *ae; -char *bsdcat_current_path; -int exit_status = 0; +static struct archive *a; +static struct archive_entry *ae; +static const char *bsdcat_current_path; +static int exit_status = 0; void @@ -68,7 +68,7 @@ version(void) } void -bsdcat_next() +bsdcat_next(void) { a = archive_read_new(); archive_read_support_filter_all(a); @@ -85,7 +85,7 @@ bsdcat_print_error(void) } void -bsdcat_read_to_stdout(char* filename) +bsdcat_read_to_stdout(const char* filename) { int r; diff --git a/cat/bsdcat.h b/cat/bsdcat.h index ca603d3d6..2e055e7c1 100644 --- a/cat/bsdcat.h +++ b/cat/bsdcat.h @@ -53,4 +53,4 @@ int bsdcat_getopt(struct bsdcat *); void usage(FILE *stream, int eval); void bsdcat_next(void); void bsdcat_print_error(void); -void bsdcat_read_to_stdout(char* filename); +void bsdcat_read_to_stdout(const char* filename); -- 2.47.2