search for: 12c4ca7

...; csv) + error (EXIT_FAILURE, 0, + _("you cannot use -h and --csv options together.")); /* User must specify at least one directory name on the command line. */ if (optind >= argc || argc - optind < 1) diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 12c4ca7..eadc472 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -23,6 +23,8 @@ #include <inttypes.h> #include <string.h> #include <unistd.h> +#include <errno.h> +#include <error.h> #include <sys/stat.h> #include <sys/wait.h> @@ -72,10 +74,8 @@...

...efault: + case MOUNTABLE_BTRFSVOL: + if (asprintf (&desc, "btrfsvol:%s/%s", + mountable->device, mountable->volume) == -1) return NULL; + return desc; + + default: + return NULL; } } diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 72fe6ac..12c4ca7 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -270,7 +270,7 @@ make_filter_strings (char *const *devices) return ret.argv; -error: + error: if (ret.argv) free_stringslen (ret.argv, ret.size); return NULL; diff --git a/daemon/lvm.c b/daemon/lvm.c index f9acfcb..421c...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

Wherever we had code which did: if (something_bad) { perror (...); exit (EXIT_FAILURE); } replace this with use of the error(3) function: if (something_bad) error (EXIT_FAILURE, errno, ...); The error(3) function is supplied by glibc, or by gnulib on platforms which don't have it, and is much more flexible than perror(3). Since we already use error(3), there seems to be