From d89975957d54ac901ce52e6e3b9ca95d96048f8f Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Tue, 24 Aug 2021 19:58:55 +0000 Subject: Trim trailing whitespace --- src/filelist.c | 2 +- src/getopt.c | 16 ++++++++-------- src/gib_list.c | 2 +- src/main.c | 2 +- src/slideshow.c | 2 +- src/wallpaper.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') 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); -- cgit v1.2.3