From f9b9640238f3b34a37653763fd0b4401deeb3cee Mon Sep 17 00:00:00 2001 From: David Griffith Date: Wed, 22 Apr 2015 01:29:25 -0700 Subject: [PATCH] Some -Wall fixes. --- src/common/screen.c | 3 ++- src/curses/ux_blorb.c | 4 ++-- src/curses/ux_blorb.h | 5 ++--- src/curses/ux_frotz.h | 4 ++++ src/curses/ux_init.c | 4 ++-- src/curses/ux_input.c | 10 +++++++++- src/curses/ux_pic.c | 6 ++---- src/curses/ux_resource.c | 4 +++- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/common/screen.c b/src/common/screen.c index 0de4de9..328dfbb 100644 --- a/src/common/screen.c +++ b/src/common/screen.c @@ -1754,7 +1754,7 @@ zword get_window_font (zword win) { zword font = wp[win].font; - if (font == TEXT_FONT) + if (font == TEXT_FONT) { if (h_version != V6) { @@ -1769,6 +1769,7 @@ zword get_window_font (zword win) font = FIXED_WIDTH_FONT; } + } return font; diff --git a/src/curses/ux_blorb.c b/src/curses/ux_blorb.c index 23d914c..21baa90 100644 --- a/src/curses/ux_blorb.c +++ b/src/curses/ux_blorb.c @@ -141,12 +141,12 @@ bb_err_t ux_blorb_init(char *filename) } /* - * ux_stop_blorb + * ux_blorb_stop * * Basically just close the Blorb file. * */ -void ux_stop_blorb(void) +void ux_blorb_stop(void) { if (blorb_fp != NULL) fclose(blorb_fp); diff --git a/src/curses/ux_blorb.h b/src/curses/ux_blorb.h index ffde5aa..95a7aa6 100644 --- a/src/curses/ux_blorb.h +++ b/src/curses/ux_blorb.h @@ -26,6 +26,5 @@ typedef struct { } myresource; - - - +bb_err_t ux_blorb_init(char *); +void ux_blorb_stop(void); diff --git a/src/curses/ux_frotz.h b/src/curses/ux_frotz.h index 632ae6b..bd155d8 100644 --- a/src/curses/ux_frotz.h +++ b/src/curses/ux_frotz.h @@ -11,6 +11,10 @@ #include "../blorb/blorblow.h" #include "ux_setup.h" +#ifndef rindex + #define rindex strrchr +#endif + #define MASTER_CONFIG "frotz.conf" #define USER_CONFIG ".frotzrc" diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c index 9d82ffd..075e368 100644 --- a/src/curses/ux_init.c +++ b/src/curses/ux_init.c @@ -103,7 +103,7 @@ void os_fatal (const char *s, ...) os_display_string((zchar *)"\n"); new_line(); os_reset_screen(); - ux_stop_blorb(); + ux_blorb_stop(); exit(1); } @@ -146,7 +146,7 @@ void os_fatal (const char *s, ...) void os_process_arguments (int argc, char *argv[]) { - int c, i; + int c; char *p = NULL; char *home; char configfile[FILENAME_MAX + 1]; diff --git a/src/curses/ux_input.c b/src/curses/ux_input.c index c872e0e..441e00a 100644 --- a/src/curses/ux_input.c +++ b/src/curses/ux_input.c @@ -79,6 +79,7 @@ static void unix_set_global_timeout(int timeout) global_timeout.tv_usec -= 1000000; } } + return; } /* This returns the number of milliseconds until the input timeout @@ -272,6 +273,8 @@ static void unix_add_to_history(zchar *str) strcpy( *history_next, (char *)str); RING_INC( history_next, history_buffer, history_end); history_view = history_next; /* Reset user frame after each line */ + + return; } /* @@ -347,6 +350,8 @@ static void scrnmove(int dest, int src, int n) } } move(y, x); + + return; } /* @@ -363,6 +368,8 @@ static void scrnset(int start, int c, int n) while (n--) mvaddch(y, start + n, c); move(y, x); + + return; } /* @@ -642,7 +649,7 @@ int os_read_file_name (char *file_name, const char *default_name, int flag) zword os_read_mouse (void) { /* INCOMPLETE */ - + return 0; } /* os_read_mouse */ @@ -675,6 +682,7 @@ void *memmove(void *s, void *t, size_t n) p += n; q += n; while (n--) *--p = *--q; } + return; } #endif /* NO_MEMMOVE */ diff --git a/src/curses/ux_pic.c b/src/curses/ux_pic.c index 451a620..0bae85c 100644 --- a/src/curses/ux_pic.c +++ b/src/curses/ux_pic.c @@ -41,7 +41,6 @@ #define PIC_HEADER_HEIGHT 4 static void safe_mvaddch(int, int, int); -static void save_scrnset(int, int, int, int); static struct { int z_num; @@ -72,7 +71,7 @@ static int round_div(int x, int y) int quotient = x / y; int dblremain = (x % y) << 1; - if ((dblremain > y) || (dblremain == y) && (quotient & 1)) + if ((dblremain > y) || ((dblremain == y) && (quotient & 1))) quotient++; return quotient; } @@ -97,7 +96,7 @@ bool unix_init_pictures (void) dotpos = strrchr(basename, '.'); namelen = (dotpos ? dotpos - basename : strlen(basename)); sprintf(filename, "%.*sgraphics/%.*s.mg1", - basename - f_setup.story_name, f_setup.story_name, namelen, basename); + (int)(basename - f_setup.story_name), f_setup.story_name, namelen, basename); do { int i, entry_size, flags, x_scale, y_scale; @@ -126,7 +125,6 @@ bool unix_init_pictures (void) /* Copy and scale. */ for (i = 1; i <= num_pictures; i++) { unsigned char *p = raw_info + entry_size * (i - 1); - int height, width; pict_info[i].z_num = lookupw(p, PIC_HEADER_NUMBER); pict_info[i].orig_height = lookupw(p, PIC_HEADER_HEIGHT); pict_info[i].orig_width = lookupw(p, PIC_HEADER_WIDTH); diff --git a/src/curses/ux_resource.c b/src/curses/ux_resource.c index bbb6a3e..10cdcb1 100644 --- a/src/curses/ux_resource.c +++ b/src/curses/ux_resource.c @@ -54,8 +54,10 @@ int ux_getresource( int num, int ispic, int method, myresource * res) int ux_freeresource(myresource *res) { if (res == NULL) - return; + return 0; if (blorb_map != NULL) return bb_unload_chunk(blorb_map, res->bbres.chunknum); + + return 0; } -- 2.34.1