summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-18 19:05:05 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-21 12:05:55 -0400
commitd1c536f5028bd924ba3c9b0ad10ba5b681b11ab6 (patch)
treedfc88a701035f1e39b0c8806a5ca899710610b56 /src/shared
parent4ca0d5ca4ac840b3946641edc20e033344e68e86 (diff)
libshared: fix compilation without libblkid
This reverts a75e27eb. a75e27eb fixed the case of libcryptsetup=no, libblkid=yes, but broke the case of libcryptsetup=no, libblkid=yes. Instead of trying to define the function only when used, which would result in too much ifdeffery, just silence the warning.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/dissect-image.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 36c94ac71b..163995c1e5 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -42,8 +42,8 @@
#include "udev-util.h"
#include "xattr-util.h"
+_unused_ static int probe_filesystem(const char *node, char **ret_fstype) {
#ifdef HAVE_BLKID
-static int probe_filesystem(const char *node, char **ret_fstype) {
_cleanup_blkid_free_probe_ blkid_probe b = NULL;
const char *fstype;
int r;
@@ -80,8 +80,10 @@ static int probe_filesystem(const char *node, char **ret_fstype) {
not_found:
*ret_fstype = NULL;
return 0;
-}
+#else
+ return -EOPNOTSUPP;
#endif
+}
int dissect_image(int fd, const void *root_hash, size_t root_hash_size, DissectImageFlags flags, DissectedImage **ret) {
@@ -949,7 +951,7 @@ int dissected_image_decrypt(
*
* = 0 → There was nothing to decrypt
* > 0 → Decrypted successfully
- * -ENOKEY → There's some to decrypt but no key was supplied
+ * -ENOKEY → There's something to decrypt but no key was supplied
* -EKEYREJECTED → Passed key was not correct
*/