@@ -1,4 +1,4 @@ | |||||
VERSION = git-20111011 | VERSION = git-20111012 | ||||
CC = gcc | CC = gcc | ||||
CFLAGS = -Wall -pedantic -O2 | CFLAGS = -Wall -pedantic -O2 | ||||
@@ -28,13 +28,13 @@ | |||||
#include "thumbs.h" | #include "thumbs.h" | ||||
#include "util.h" | #include "util.h" | ||||
void cleanup(); | void cleanup(void); | ||||
void remove_file(int, bool); | void remove_file(int, bool); | ||||
void load_image(int); | void load_image(int); | ||||
void redraw(); | void redraw(void); | ||||
void reset_cursor(); | void reset_cursor(void); | ||||
void animate(); | void animate(void); | ||||
void slideshow(); | void slideshow(void); | ||||
void set_timeout(timeout_f, int, bool); | void set_timeout(timeout_f, int, bool); | ||||
void reset_timeout(timeout_f); | void reset_timeout(timeout_f); | ||||
@@ -49,10 +49,10 @@ typedef struct { | |||||
} timeout_t; | } timeout_t; | ||||
/* timeout handler functions: */ | /* timeout handler functions: */ | ||||
void redraw(); | void redraw(void); | ||||
void reset_cursor(); | void reset_cursor(void); | ||||
void animate(); | void animate(void); | ||||
void slideshow(); | void slideshow(void); | ||||
appmode_t mode; | appmode_t mode; | ||||
img_t img; | img_t img; | ||||
@@ -72,7 +72,7 @@ timeout_t timeouts[] = { | |||||
{ { 0, 0 }, false, slideshow }, | { { 0, 0 }, false, slideshow }, | ||||
}; | }; | ||||
void cleanup() { | void cleanup(void) { | ||||
static bool in = false; | static bool in = false; | ||||
if (!in) { | if (!in) { | ||||
@@ -216,7 +216,7 @@ void load_image(int new) { | |||||
reset_timeout(animate); | reset_timeout(animate); | ||||
} | } | ||||
void update_title() { | void update_title(void) { | ||||
int n; | int n; | ||||
char sshow_info[16]; | char sshow_info[16]; | ||||
char frame_info[16]; | char frame_info[16]; | ||||
@@ -260,7 +260,7 @@ void update_title() { | |||||
win_set_title(&win, win_title); | win_set_title(&win, win_title); | ||||
} | } | ||||
void redraw() { | void redraw(void) { | ||||
if (mode == MODE_IMAGE) { | if (mode == MODE_IMAGE) { | ||||
img_render(&img); | img_render(&img); | ||||
if (img.slideshow && !img.multi.animate) { | if (img.slideshow && !img.multi.animate) { | ||||
@@ -277,7 +277,7 @@ void redraw() { | |||||
reset_cursor(); | reset_cursor(); | ||||
} | } | ||||
void reset_cursor() { | void reset_cursor(void) { | ||||
int i; | int i; | ||||
cursor_t cursor = CURSOR_NONE; | cursor_t cursor = CURSOR_NONE; | ||||
@@ -298,14 +298,14 @@ void reset_cursor() { | |||||
win_set_cursor(&win, cursor); | win_set_cursor(&win, cursor); | ||||
} | } | ||||
void animate() { | void animate(void) { | ||||
if (img_frame_animate(&img, false)) { | if (img_frame_animate(&img, false)) { | ||||
redraw(); | redraw(); | ||||
set_timeout(animate, img.multi.frames[img.multi.sel].delay, true); | set_timeout(animate, img.multi.frames[img.multi.sel].delay, true); | ||||
} | } | ||||
} | } | ||||
void slideshow() { | void slideshow(void) { | ||||
if (mode == MODE_IMAGE && !img.multi.animate) { | if (mode == MODE_IMAGE && !img.multi.animate) { | ||||
if (fileidx + 1 < filecnt) { | if (fileidx + 1 < filecnt) { | ||||
load_image(fileidx + 1); | load_image(fileidx + 1); | ||||
@@ -390,7 +390,7 @@ void on_buttonpress(XButtonEvent *bev) { | |||||
} | } | ||||
} | } | ||||
void run() { | void run(void) { | ||||
int xfd; | int xfd; | ||||
fd_set fds; | fd_set fds; | ||||
struct timeval timeout; | struct timeval timeout; | ||||
@@ -32,12 +32,12 @@ | |||||
options_t _options; | options_t _options; | ||||
const options_t *options = (const 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] " | printf("usage: sxiv [-cdFfhpqrstvZ] [-g GEOMETRY] [-n NUM] " | ||||
"[-z ZOOM] FILES...\n"); | "[-z ZOOM] FILES...\n"); | ||||
} | } | ||||
void print_version() { | void print_version(void) { | ||||
printf("sxiv %s - Simple X Image Viewer\n", VERSION); | printf("sxiv %s - Simple X Image Viewer\n", VERSION); | ||||
printf("Additional features included (+) or not (-): %s, %s\n", | printf("Additional features included (+) or not (-): %s, %s\n", | ||||
#if EXIF_SUPPORT | #if EXIF_SUPPORT | ||||
@@ -48,8 +48,8 @@ typedef struct { | |||||
extern const options_t *options; | extern const options_t *options; | ||||
void print_usage(); | void print_usage(void); | ||||
void print_version(); | void print_version(void); | ||||
void parse_options(int, char**); | void parse_options(int, char**); | ||||
@@ -38,7 +38,7 @@ void exif_auto_orientate(const fileinfo_t*); | |||||
const int thumb_dim = THUMB_SIZE + 10; | const int thumb_dim = THUMB_SIZE + 10; | ||||
char *cache_dir = NULL; | char *cache_dir = NULL; | ||||
bool tns_cache_enabled() { | bool tns_cache_enabled(void) { | ||||
struct stat stats; | struct stat stats; | ||||
return cache_dir != NULL && stat(cache_dir, &stats) == 0 && | return cache_dir != NULL && stat(cache_dir, &stats) == 0 && | ||||
@@ -34,7 +34,7 @@ enum { | |||||
FNAME_LEN = 1024 | FNAME_LEN = 1024 | ||||
}; | }; | ||||
void cleanup(); | void cleanup(void); | ||||
void* s_malloc(size_t size) { | void* s_malloc(size_t size) { | ||||
void *ptr; | void *ptr; | ||||