From a09b20c5e63839b10bae306e4a23ca5a9d8ebac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bert=20M=C3=BCnnich?= Date: Wed, 12 Oct 2011 18:38:29 +0200 Subject: [PATCH] Use void for empty argument lists --- Makefile | 2 +- commands.c | 10 +++++----- main.c | 22 +++++++++++----------- options.c | 4 ++-- options.h | 4 ++-- thumbs.c | 2 +- util.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 413c10b..260c43e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = git-20111011 +VERSION = git-20111012 CC = gcc CFLAGS = -Wall -pedantic -O2 diff --git a/commands.c b/commands.c index 2688c09..0274655 100644 --- a/commands.c +++ b/commands.c @@ -28,13 +28,13 @@ #include "thumbs.h" #include "util.h" -void cleanup(); +void cleanup(void); void remove_file(int, bool); void load_image(int); -void redraw(); -void reset_cursor(); -void animate(); -void slideshow(); +void redraw(void); +void reset_cursor(void); +void animate(void); +void slideshow(void); void set_timeout(timeout_f, int, bool); void reset_timeout(timeout_f); diff --git a/main.c b/main.c index 876ab4e..af41371 100644 --- a/main.c +++ b/main.c @@ -49,10 +49,10 @@ typedef struct { } timeout_t; /* timeout handler functions: */ -void redraw(); -void reset_cursor(); -void animate(); -void slideshow(); +void redraw(void); +void reset_cursor(void); +void animate(void); +void slideshow(void); appmode_t mode; img_t img; @@ -72,7 +72,7 @@ timeout_t timeouts[] = { { { 0, 0 }, false, slideshow }, }; -void cleanup() { +void cleanup(void) { static bool in = false; if (!in) { @@ -216,7 +216,7 @@ void load_image(int new) { reset_timeout(animate); } -void update_title() { +void update_title(void) { int n; char sshow_info[16]; char frame_info[16]; @@ -260,7 +260,7 @@ void update_title() { win_set_title(&win, win_title); } -void redraw() { +void redraw(void) { if (mode == MODE_IMAGE) { img_render(&img); if (img.slideshow && !img.multi.animate) { @@ -277,7 +277,7 @@ void redraw() { reset_cursor(); } -void reset_cursor() { +void reset_cursor(void) { int i; cursor_t cursor = CURSOR_NONE; @@ -298,14 +298,14 @@ void reset_cursor() { win_set_cursor(&win, cursor); } -void animate() { +void animate(void) { if (img_frame_animate(&img, false)) { redraw(); set_timeout(animate, img.multi.frames[img.multi.sel].delay, true); } } -void slideshow() { +void slideshow(void) { if (mode == MODE_IMAGE && !img.multi.animate) { if (fileidx + 1 < filecnt) { load_image(fileidx + 1); @@ -390,7 +390,7 @@ void on_buttonpress(XButtonEvent *bev) { } } -void run() { +void run(void) { int xfd; fd_set fds; struct timeval timeout; diff --git a/options.c b/options.c index 2226040..97d7350 100644 --- a/options.c +++ b/options.c @@ -32,12 +32,12 @@ options_t _options; const options_t *options = (const options_t*) &_options; -void print_usage() { +void print_usage(void) { printf("usage: sxiv [-cdFfhpqrstvZ] [-g GEOMETRY] [-n NUM] " "[-z ZOOM] FILES...\n"); } -void print_version() { +void print_version(void) { printf("sxiv %s - Simple X Image Viewer\n", VERSION); printf("Additional features included (+) or not (-): %s, %s\n", #if EXIF_SUPPORT diff --git a/options.h b/options.h index 3bf685a..d04b38c 100644 --- a/options.h +++ b/options.h @@ -48,8 +48,8 @@ typedef struct { extern const options_t *options; -void print_usage(); -void print_version(); +void print_usage(void); +void print_version(void); void parse_options(int, char**); diff --git a/thumbs.c b/thumbs.c index b2c9e0e..b3b230d 100644 --- a/thumbs.c +++ b/thumbs.c @@ -38,7 +38,7 @@ void exif_auto_orientate(const fileinfo_t*); const int thumb_dim = THUMB_SIZE + 10; char *cache_dir = NULL; -bool tns_cache_enabled() { +bool tns_cache_enabled(void) { struct stat stats; return cache_dir != NULL && stat(cache_dir, &stats) == 0 && diff --git a/util.c b/util.c index 772908d..ccbce1f 100644 --- a/util.c +++ b/util.c @@ -34,7 +34,7 @@ enum { FNAME_LEN = 1024 }; -void cleanup(); +void cleanup(void); void* s_malloc(size_t size) { void *ptr;