From 8a2b5a9e5b8aad195531603aedbbdd5a9eb98bfa Mon Sep 17 00:00:00 2001 From: jcid Date: Sun, 14 Sep 2008 16:07:12 +0200 Subject: - Made several cleanups according to compiler warnings with "-W -Wall". --- src/IO/IO.c | 6 +++--- src/bw.c | 8 +------- src/bw.h | 2 +- src/chain.c | 7 ++++--- src/dicache.c | 3 +-- src/dicache.h | 2 +- src/gif.c | 2 +- src/jpeg.c | 2 +- src/png.c | 4 ++-- src/uicmd.cc | 2 +- 10 files changed, 16 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/IO/IO.c b/src/IO/IO.c index 8dd3a1ae..adf4dbb4 100644 --- a/src/IO/IO.c +++ b/src/IO/IO.c @@ -259,7 +259,7 @@ static bool_t IO_write(IOData_t *io) * Handle background IO for a given FD (reads | writes) * (This function gets called when there's activity in the FD) */ -static int IO_callback(int fd, IOData_t *io) +static int IO_callback(IOData_t *io) { bool_t ret = FALSE; @@ -288,7 +288,7 @@ static void IO_fd_read_cb(int fd, void *data) a_IOwatch_remove_fd(fd, DIO_READ); } else { - if (IO_callback(fd, io) == 0) + if (IO_callback(io) == 0) a_IOwatch_remove_fd(fd, DIO_READ); } } @@ -307,7 +307,7 @@ static void IO_fd_write_cb(int fd, void *data) a_IOwatch_remove_fd(fd, DIO_WRITE); } else { - if (IO_callback(fd, io) == 0) + if (IO_callback(io) == 0) a_IOwatch_remove_fd(fd, DIO_WRITE); } } diff --git a/src/bw.c b/src/bw.c index 3f4ff9c1..e44d6f9d 100644 --- a/src/bw.c +++ b/src/bw.c @@ -40,7 +40,7 @@ void a_Bw_init(void) * Create a new browser window and return it. * (the new window is stored in browser_window[]) */ -BrowserWindow *a_Bw_new(int width, int height, uint32_t xid) +BrowserWindow *a_Bw_new() { BrowserWindow *bw; @@ -57,12 +57,6 @@ BrowserWindow *a_Bw_new(int width, int height, uint32_t xid) bw->nav_expecting = FALSE; bw->nav_expect_url = NULL; -// if (!xid) -// bw->main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); -// else -// bw->main_window = gtk_plug_new(xid); - - bw->redirect_level = 0; bw->sens_idle_up = 0; diff --git a/src/bw.h b/src/bw.h index 8d47751f..cf884d3a 100644 --- a/src/bw.h +++ b/src/bw.h @@ -73,7 +73,7 @@ extern "C" { void a_Bw_init(void); -BrowserWindow *a_Bw_new(int width, int height, uint32_t xid); +BrowserWindow *a_Bw_new(); void a_Bw_free(BrowserWindow *bw); BrowserWindow *a_Bw_get(); diff --git a/src/chain.c b/src/chain.c index 354817ea..37f43a7f 100644 --- a/src/chain.c +++ b/src/chain.c @@ -20,18 +20,19 @@ /* * Show debugging info */ +#if VERBOSE static void Chain_debug_msg(char *FuncStr, int Op, int Branch, int Dir, ChainLink *Info) { -#if VERBOSE const char *StrOps[] = {"", "OpStart", "OpSend", "OpStop", "OpEnd", "OpAbort"}; MSG("%-*s: %-*s [%d%s] Info=%p Flags=%d\n", 12, FuncStr, 7, StrOps[Op], Branch, (Dir == 1) ? "F" : "B", Info, Info ? Info->Flags : -1); -#endif } - +#else +static void Chain_debug_msg() { } +#endif /* * Create and initialize a new chain-link */ diff --git a/src/dicache.c b/src/dicache.c index 4bdbb71b..272c14a6 100644 --- a/src/dicache.c +++ b/src/dicache.c @@ -387,10 +387,9 @@ void a_Dicache_new_scan(DilloImage *image, const DilloUrl *url, int version) * (Write a scan line into the Dicache entry) * buf: row buffer * Y : row number - * x : horizontal offset? (always zero) */ void a_Dicache_write(DilloImage *Image, DilloUrl *url, int version, - const uchar_t *buf, int x, uint_t Y) + const uchar_t *buf, uint_t Y) { DICacheEntry *DicEntry; diff --git a/src/dicache.h b/src/dicache.h index a67261c7..6cbcf3a5 100644 --- a/src/dicache.h +++ b/src/dicache.h @@ -56,7 +56,7 @@ void a_Dicache_set_cmap(DilloUrl *url, int version, DilloImage *Image, int num_colors_max, int bg_index); void a_Dicache_new_scan(DilloImage *image, const DilloUrl *url, int version); void a_Dicache_write(DilloImage *Image, DilloUrl *url, int version, - const uchar_t *buf, int x, uint_t Y); + const uchar_t *buf, uint_t Y); void a_Dicache_close(DilloUrl *url, int version, CacheClient_t *Client); void a_Dicache_invalidate_entry(const DilloUrl *Url); diff --git a/src/gif.c b/src/gif.c index 67560a5c..7d2920a6 100644 --- a/src/gif.c +++ b/src/gif.c @@ -421,7 +421,7 @@ static void Gif_lwz_init(DilloGif *gif) */ static void Gif_emit_line(DilloGif *gif, const uchar_t *linebuf) { - a_Dicache_write(gif->Image, gif->url, gif->version, linebuf, 0, gif->y); + a_Dicache_write(gif->Image, gif->url, gif->version, linebuf, gif->y); if (gif->Flags & INTERLACE) { switch (gif->pass) { case 0: diff --git a/src/jpeg.c b/src/jpeg.c index 168f422e..6251ab47 100644 --- a/src/jpeg.c +++ b/src/jpeg.c @@ -350,7 +350,7 @@ static void Jpeg_write(DilloJpeg *jpeg, void *Buf, uint_t BufSize) break; } a_Dicache_write(jpeg->Image, jpeg->url, jpeg->version, - linebuf, 0, jpeg->y); + linebuf, jpeg->y); jpeg->y++; diff --git a/src/png.c b/src/png.c index 0354485e..4b401889 100644 --- a/src/png.c +++ b/src/png.c @@ -240,7 +240,7 @@ static void case 3: a_Dicache_write(png->Image, png->url, png->version, png->image_data + (row_num * png->rowbytes), - 0, (uint_t)row_num); + (uint_t)row_num); break; case 4: { @@ -277,7 +277,7 @@ static void } } a_Dicache_write(png->Image, png->url, png->version, - png->linebuf, 0, (uint_t)row_num); + png->linebuf, (uint_t)row_num); break; } default: diff --git a/src/uicmd.cc b/src/uicmd.cc index 5634e676..ca716692 100644 --- a/src/uicmd.cc +++ b/src/uicmd.cc @@ -93,7 +93,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *v_ui) viewport->setScrollStep((int) rint(14.0 * prefs.font_factor)); // Now, create a new browser window structure - BrowserWindow *new_bw = a_Bw_new(ww, wh, 0); + BrowserWindow *new_bw = a_Bw_new(); // Set new_bw as callback data for UI new_ui->user_data(new_bw); -- cgit v1.2.3