diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2012-03-01 23:58:41 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2012-03-01 23:58:41 +0100 |
| commit | 88d1ad68b27e84407bc63ab837b8c155b6b2b761 (patch) | |
| tree | 749a2ab14394b4c2d8f9809b9bd023aeedf78baf | |
| parent | 69ecc5c1fdbff7c26d2d59cfdda86eeaf0ffadff (diff) | |
quiet/verbose adjustments
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/filelist.c | 21 | ||||
| -rw-r--r-- | src/slideshow.c | 2 |
3 files changed, 11 insertions, 14 deletions
@@ -7,6 +7,8 @@ git HEAD * feh --list now uses %S/%P to print image size and amount of pixels * Fix zoom_default key (caused blurry images in some cases due to a bad workaround) + * make --quiet and --verbose behave more like their documented way, never + ignore out of memory errors Thu, 02 Feb 2012 21:04:06 +0100 Daniel Friesel <derf@finalrewind.org> diff --git a/src/filelist.c b/src/filelist.c index 9756c27..34df6cf 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -215,15 +215,13 @@ void add_file_to_filelist_recursively(char *origpath, unsigned char level) } n = scandir(path, &de, file_selector_all, alphasort); if (n < 0) { - switch (errno) { - case ENOMEM: - if (!opt.quiet) - weprintf("Insufficient memory to scan directory %s:", path); - break; - default: - if (!opt.quiet) - weprintf("Failed to scan directory %s:", path); - } + switch (errno) { + case ENOMEM: + weprintf("Insufficient memory to scan directory %s:", path); + break; + default: + weprintf("Failed to scan directory %s:", path); + } } for (cnt = 0; cnt < n; cnt++) { @@ -275,9 +273,6 @@ gib_list *feh_file_info_preload(gib_list * list) feh_file *file = NULL; gib_list *remove_list = NULL; - if (opt.verbose) - fputs(PACKAGE " - preloading...\n", stdout); - for (l = list; l; l = l->next) { file = FEH_FILE(l->data); D(("file %p, file->next %p, file->name %s\n", l, l->next, file->name)); @@ -533,7 +528,7 @@ void feh_save_filelist() tmpname = feh_unique_filename("", "filelist"); - if (!opt.quiet) + if (opt.verbose) printf("saving filelist to filename '%s'\n", tmpname); feh_write_filelist(filelist, tmpname); diff --git a/src/slideshow.c b/src/slideshow.c index a65d95e..a868a44 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -571,7 +571,7 @@ void slideshow_save_image(winwidget win) tmpname = feh_unique_filename("", "noname.png"); } - if (!opt.quiet) + if (opt.verbose) printf("saving image to filename '%s'\n", tmpname); /* XXX gib_imlib_save_image_with_error_return breaks with *.XXX and |