Trim trailing whitespace

9 files changed, 31 insertions, 32 deletions

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index e7a4207..5477164 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -27,12 +27,12 @@ jobs:
         run: sudo apt-get -y install build-essential libx11-dev libxt-dev libimlib2-dev libtest-command-perl libtest-simple-perl
       - name: Install libcurl
         if: matrix.curl
-        run: sudo apt-get -y  install libcurl4-openssl-dev
+        run: sudo apt-get -y install libcurl4-openssl-dev
       - name: Install libexif
         if: matrix.exif
-        run: sudo apt-get -y  install libexif-dev
+        run: sudo apt-get -y install libexif-dev
       - name: Install Xinerama
         if: matrix.xinerama
-        run: sudo apt-get -y  install libxinerama-dev
+        run: sudo apt-get -y install libxinerama-dev
       - name: Build and Test
         run: for inotify in 0 1; do for verscmp in 0 1; do make curl=${{ matrix.curl }} exif=${{ matrix.exif }} inotify=$inotify verscmp=$verscmp xinerama=${{ matrix.xinerama }} && make test && make clean; done; done
diff --git a/ChangeLog b/ChangeLog
index 4ed55e9..87d747a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1238,8 +1238,8 @@ Mon Mar 07 23:56:03 GMT 2005  Tom Gilbert <tom@linuxbrit.co.uk>
      > In short, it enables the user to use feh as an image viewer used by a
      > file manager like ROX-Filer or Nautilus when invoked with the --fmmode
      > option. The file manager passes the file that the user wants to view to
-     > feh. My function then reads the directory in which the file resides and 
-     > first passes the current image, then alphabetically all the following 
+     > feh. My function then reads the directory in which the file resides and
+     > first passes the current image, then alphabetically all the following
      > images and at last the images that are alphabetically before the current
      > file to the 'filelist'.
      > Afaik that's the default behaviour of gqview and gthumb.
@@ -1285,7 +1285,7 @@ Fri Sep 03 13:40:48 BST 2004  Tom Gilbert <tom@linuxbrit.co.uk>
 
 Sat Jul 24 14:52:19 BST 2004  Tom Gilbert <tom@linuxbrit.co.uk>
 
-  * Various warning fixes from Claes Nasten <pekdon@pekdon.net> 
+  * Various warning fixes from Claes Nasten <pekdon@pekdon.net>
 
 Thu Jun 10 23:14:36 BST 2004  Tom Gilbert <tom@linuxbrit.co.uk>
 
@@ -1416,13 +1416,13 @@ Sun Oct 20 20:12:23 2002 EDT, Paul Duncan <pabs@pablotron.org>
   * AUTHORS: added Jon Bernard
 
 Sun Oct 20 14:49:46 2002 EDT, Paul Duncan <pabs@pablotron.org>
-  
+
   * New beveled, off-white background image for menus.  I made it the
     default after consulting with the boss (eg Sue Gilbert).  Tom thinks
     it's okay too.
 
 Sun Oct 20 05:48:40 2002 EDT  Paul Duncan <pabs@pablotron.org>
-  
+
   * Added Xinerama support.  Currently defaults to fullscreen on the
     first head (this can be fixed with a little work).
   * Added winwidget_{move,get_geometry}();
@@ -1983,7 +1983,7 @@ Fri Jun 23 11:37:56 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 Thu Jun 22 23:57:33 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 
 	* Optimisations to thumb hilites. Only show hilite when you can
-	click to open an image, don't show when over emtpy space, and 
+	click to open an image, don't show when over emtpy space, and
 	don't re-render if the selection hasn't changed from the last
 	mouseover. Speeds it up a lot.
 
@@ -2086,7 +2086,7 @@ Sun Jun 18 03:47:58 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 
 Sun Jun 18 01:29:16 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 
-	* The first part of some background setting code from richlowe 
+	* The first part of some background setting code from richlowe
 	<richlowe@btinternet.com> - more to come, it'll be sweet.
 	* Doesn't work yet btw, so don't get excited ;)
 
@@ -2108,7 +2108,7 @@ Sat Jun 17 23:46:32 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 	bg. Same for --theme chrome.
 
 Sat Jun 17 12:57:49 PDT 2000 Paul Duncan <pabs@pablotron.org>
-   
+
    * wget is now quiet by default (wget -q). it's verbose if the
    -V or --verbose flag is passed to feh.  Your terminal will
    thank you.
@@ -2183,7 +2183,7 @@ Sun Jun  4 15:44:05 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 	the singleton context (accidentally leaving context_antialias on,
 	not blending when I should be etc), and to fix them I was adding
 	lines and lines of context_set this, context_set that. I've
-	wrapped the imlib calls in an imlib1 
+	wrapped the imlib calls in an imlib1
 	lots-of-params-per-function-call stylee, and now it's much more
 	readable and harder to break.
 	* In the process, made big speedups by not antialiasing when I
@@ -2522,7 +2522,7 @@ Fri Mar 24 19:22:51 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 	* If ~/.fehrc exists, or if not, but /etc/fehrc exists, feh will
 	look in it for name/options pairs. An example entry would be:
 	imagemap -rVq --thumb-width 40 --thumb-height 30
-	* You can use the theme in two ways. Either 
+	* You can use the theme in two ways. Either
 	feh -C themename [images]
 	or you can create a symbolic link to feh with the name of the
 	options you want it to use. So from the example above:
@@ -2535,7 +2535,7 @@ Fri Mar 24 19:22:51 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 	create an index.jpg in the current directory. I just run:
 	$ mkindex.
 	* An example.fehrc is provided with a couple of cool examples.
-	
+
 Fri Mar 24 19:17:27 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 
 	* Slightly increased the default index mode font size.
@@ -2771,11 +2771,11 @@ Fri Mar  3 22:44:25 PST 2000  Michael Jennings <mej@eterm.org>
 	tired right now to try to make sense out of gilbertt's callback
 	logic. :-)  I'll try to fix it this weekend if he doesn't beat me
 	to it.
-	
+
 Wed Mar  1 15:13:04 PST 2000  Michael Jennings <mej@eterm.org>
 
 	* Math lib
-	
+
 Sun Feb 20 15:22:00 2000  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 
 	* Remove some crufty duplication.
@@ -3078,7 +3078,7 @@ Sun Dec 19 22:06:43 1999  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 Sun Dec 19 20:29:33 1999  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 
 	* Added a .spec file for feh. Contributed by Alistair Sutton
-	<metallica@freenet.co.uk>, (who is obviously a metallica fan ;), 
+	<metallica@freenet.co.uk>, (who is obviously a metallica fan ;),
 	and has written specs for me before ::) Thanks dude :)
 	* Urm. I haven't actually tested this yet :)
 
@@ -3188,4 +3188,3 @@ Thu Dec 16 22:58:21 1999  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 Thu Dec 16 22:10:50 1999  Tom Gilbert  <gilbertt@linuxbrit.co.uk>
 
 	* Initial import. Feh is currently at 0.5.0 release level.
-
diff --git a/examples/buttons b/examples/buttons
index 3c79413..be6ce39 100644
--- a/examples/buttons
+++ b/examples/buttons
@@ -14,4 +14,4 @@ zoom 3
 
 # make scroll wheel (mousewheel up and down) zoom, instead of flipping images
 zoom_in 4
-zoom_out 5
\ No newline at end of file
+zoom_out 5
diff --git a/src/filelist.c b/src/filelist.c
index 0aeaa02..811151e 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -641,7 +641,7 @@ char *feh_absolute_path(char *path)
 	   filelist file can be saved anywhere and feh will still find the
 	   images */
 	D(("Need to convert %s to an absolute form\n", path));
-	/* I SHOULD be able to just use a simple realpath() here, but dumb * 
+	/* I SHOULD be able to just use a simple realpath() here, but dumb *
 	   old Solaris's realpath doesn't return an absolute path if the
 	   path you give it is relative. Linux and BSD get this right... */
 	if (getcwd(cwd, sizeof(cwd)) == NULL)
diff --git a/src/getopt.c b/src/getopt.c
index eaae3f7..7641c4b 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -296,7 +296,7 @@ char **argv;
 
 	/* Exchange the shorter segment with the far end of the longer segment.
 	   That puts the shorter segment into the right place. It leaves the
-	   longer segment in the right place overall, but it consists of two parts 
+	   longer segment in the right place overall, but it consists of two parts
 	   that need to be swapped next.  */
 
 #ifdef _LIBC
@@ -304,7 +304,7 @@ char **argv;
 	   can work normally.  Our top argument must be in the range of the
 	   string.  */
 	if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) {
-		/* We must extend the array.  The user plays games with us and presents 
+		/* We must extend the array.  The user plays games with us and presents
 		   new arguments.  */
 		char *new_str = malloc(top + 1);
 
@@ -534,7 +534,7 @@ int long_only;
 		}
 
 		/* The special ARGV-element `--' means premature end of options. Skip
-		   it like a null option, then exchange with previous non-options as if 
+		   it like a null option, then exchange with previous non-options as if
 		   it were an option, then skip everything else like a non-option.  */
 
 		if (optind != argc && !strcmp(argv[optind], "--")) {
@@ -580,7 +580,7 @@ int long_only;
 
 	/* Check whether the ARGV-element is a long option.
 
-	   If long_only and the ARGV-element has the form "-f", where f is a valid 
+	   If long_only and the ARGV-element has the form "-f", where f is a valid
 	   short option, don't consider it an abbreviated form of a long option
 	   that starts with f.  Otherwise there would be no way to give the -f
 	   short option.
@@ -605,7 +605,7 @@ int long_only;
 		for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
 			/* Do nothing.  */ ;
 
-		/* Test all long options for either exact match or abbreviated matches. 
+		/* Test all long options for either exact match or abbreviated matches.
 		 */
 		for (p = longopts, option_index = 0; p->name; p++, option_index++)
 			if (!strncmp(p->name, nextchar, nameend - nextchar)) {
@@ -686,7 +686,7 @@ int long_only;
 			return pfound->val;
 		}
 
-		/* Can't find it as a long option.  If this is not getopt_long_only, or 
+		/* Can't find it as a long option.  If this is not getopt_long_only, or
 		   the option starts with '--' or is not a valid short option, then
 		   it's an error. Otherwise interpret it as a short option.  */
 		if (!long_only || argv[optind][1] == '-' || my_index(optstring, *nextchar) == NULL) {
@@ -761,7 +761,7 @@ int long_only;
 				   taking next ARGV-elt as argument.  */
 				optarg = argv[optind++];
 
-			/* optarg is now the argument, see if it's in the table of longopts. 
+			/* optarg is now the argument, see if it's in the table of longopts.
 			 */
 
 			for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
@@ -830,7 +830,7 @@ int long_only;
 				return pfound->val;
 			}
 			nextchar = NULL;
-			return 'W';	/* Let the application handle it. 
+			return 'W';	/* Let the application handle it.
 					 */
 		}
 		if (temp[1] == ':') {
diff --git a/src/gib_list.c b/src/gib_list.c
index a8ba1dd..e7710bc 100644
--- a/src/gib_list.c
+++ b/src/gib_list.c
@@ -520,7 +520,7 @@ gib_list_find(gib_list *root, unsigned char (*find_func)(gib_list *node, void *d
 	for (i=root; i; i=i->next)
 		if (find_func(i,data))
 			return i;
-	
+
 	return NULL;
 }
 
diff --git a/src/main.c b/src/main.c
index 4db4b36..3d124fd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -243,7 +243,7 @@ int feh_main_iteration(int block)
 	}
 	if (window_num == 0 || sig_exit != 0)
 		return(0);
-	
+
 	return(1);
 }
 
diff --git a/src/slideshow.c b/src/slideshow.c
index 87ec4cb..80bd476 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -165,7 +165,7 @@ void cb_reload_timer(void *data)
 		if (opt.filelistfile) {
 			filelist = gib_list_cat(filelist, feh_read_filelist(opt.filelistfile));
 		}
-		
+
 		if (!(filelist_len = gib_list_length(filelist))) {
 			eprintf("No files found to reload.");
 		}
diff --git a/src/wallpaper.c b/src/wallpaper.c
index 5adb3ca..71cee29 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -591,7 +591,7 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
 
 		if (data_root)
 			XFree(data_root);
-	
+
 		if (data_esetroot)
 			XFree(data_esetroot);