Commit 72fc88a9 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Remove unused variables

parent ae1de0d8

src/keyevents.c

+1 −2
Original line number Diff line number Diff line
@@ -350,7 +350,6 @@ void feh_event_invoke_action(winwidget winwid, unsigned char action) 


void feh_event_handle_keypress(XEvent * ev)

{

	int len;

	int state;

	char kbuf[20];

	KeySym keysym;
@@ -368,7 +367,7 @@ void feh_event_handle_keypress(XEvent * ev) 
	}



	kev = (XKeyEvent *) ev;

	len = XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, NULL);

	XLookupString(&ev->xkey, (char *) kbuf, sizeof(kbuf), &keysym, NULL);

	state = kev->state & (ControlMask | ShiftMask | Mod1Mask | Mod4Mask);



	if (isascii(keysym))

src/menu.c

+3 −8
Original line number Diff line number Diff line
@@ -439,14 +439,12 @@ void feh_menu_show_at_submenu(feh_menu * m, feh_menu * parent_m, feh_menu_item * 


void feh_menu_move(feh_menu * m, int x, int y)

{

	int dx, dy;



	if (!m)

		return;

	dx = x - m->x;

	dy = y - m->y;



	if (m->visible)

		XMoveWindow(disp, m->win, x, y);



	m->x = x;

	m->y = y;

	return;
@@ -580,7 +578,6 @@ void feh_menu_entry_get_size(feh_menu * m, feh_menu_item * i, int *w, int *h) 
	}



	return;

	m = NULL;

}



void feh_menu_calc_size(feh_menu * m)
@@ -621,16 +618,14 @@ void feh_menu_calc_size(feh_menu * m) 


			im = i->icon;

			if (im) {

				int iw, ih, ow, oh;

				int iw, ih, ow;



				iw = gib_imlib_image_get_width(im);

				ih = gib_imlib_image_get_height(im);

				if (ih <= max_h) {

					ow = iw;

					oh = ih;

				} else {

					ow = (iw * max_h) / ih;

					oh = max_h;

				}

				if (ow > icon_w)

					icon_w = ow;

src/options.c

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
static void check_options(void);

static void feh_getopt_theme(int argc, char **argv);

static void feh_parse_option_array(int argc, char **argv, int finalrun);

static void feh_check_theme_options(int arg, char **argv);

static void feh_check_theme_options(int argc, char **argv);

static void feh_parse_options_from_string(char *opts);

static void feh_load_options_for_theme(char *theme);

static void show_usage(void);
@@ -120,7 +120,7 @@ void init_parse_options(int argc, char **argv) 
	return;

}



static void feh_check_theme_options(int arg, char **argv)

static void feh_check_theme_options(int argc, char **argv)

{

	if (!theme) {

		/* This prevents screw up when running src/feh or ./feh */
@@ -137,7 +137,6 @@ static void feh_check_theme_options(int arg, char **argv) 


	free(theme);

	return;

	arg = 0;

}



static void feh_load_options_for_theme(char *theme)

src/slideshow.c

+0 −2
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ void feh_reload_image(winwidget w, int resize, int force_new) 


void slideshow_change_image(winwidget winwid, int change)

{

	int success = 0;

	gib_list *last = NULL;

	int i = 0;

	int jmp = 1;
@@ -253,7 +252,6 @@ void slideshow_change_image(winwidget winwid, int change) 


		if ((winwidget_loadimage(winwid, FEH_FILE(current_file->data)))

		    != 0) {

			success = 1;

			winwid->mode = MODE_NORMAL;

			winwid->file = current_file;

			if ((winwid->im_w != gib_imlib_image_get_width(winwid->im))