eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix unused parameter in blkid handlers.

Browse Source
This commit is contained in:
Milan Broz
2023-08-16 13:41:30 +02:00
parent b31863c052
commit 95425d45dd
1 changed files with 101 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
lib/utils_blkid.c
View File

@@ -29,6 +29,7 @@
#include "utils_io.h"
#ifdef HAVE_BLKID
#include <blkid/blkid.h>
/* make bad checksums flag optional */
#ifndef BLKID_SUBLKS_BADCSUM
@@ -45,11 +46,9 @@ static size_t crypt_getpagesize(void)
return r <= 0 ? 4096 : (size_t)r;
}
#endif
#endif
void blk_set_chains_for_wipes(struct blkid_handle *h)
{
#ifdef HAVE_BLKID
blkid_probe_enable_partitions(h->pr, 1);
blkid_probe_set_partitions_flags(h->pr, 0
#ifdef HAVE_BLKID_WIPE
@@ -65,7 +64,6 @@ void blk_set_chains_for_wipes(struct blkid_handle *h)
BLKID_SUBLKS_VERSION |
BLKID_SUBLKS_MAGIC |
BLKID_SUBLKS_BADCSUM);
#endif
}
void blk_set_chains_for_full_print(struct blkid_handle *h)
@@ -75,25 +73,19 @@ void blk_set_chains_for_full_print(struct blkid_handle *h)
void blk_set_chains_for_superblocks(struct blkid_handle *h)
{
#ifdef HAVE_BLKID
blkid_probe_enable_superblocks(h->pr, 1);
blkid_probe_set_superblocks_flags(h->pr, BLKID_SUBLKS_TYPE);
#endif
}
void blk_set_chains_for_fast_detection(struct blkid_handle *h)
{
#ifdef HAVE_BLKID
blkid_probe_enable_partitions(h->pr, 1);
blkid_probe_set_partitions_flags(h->pr, 0);
blk_set_chains_for_superblocks(h);
#endif
}
int blk_init_by_path(struct blkid_handle **h, const char *path)
{
int r = -ENOTSUP;
#ifdef HAVE_BLKID
struct blkid_handle *tmp = malloc(sizeof(*tmp));
if (!tmp)
return -ENOMEM;
@@ -107,16 +99,11 @@ int blk_init_by_path(struct blkid_handle **h, const char *path)
}
*h = tmp;
r = 0;
#endif
return r;
return 0;
}
int blk_init_by_fd(struct blkid_handle **h, int fd)
{
int r = -ENOTSUP;
#ifdef HAVE_BLKID
struct blkid_handle *tmp = malloc(sizeof(*tmp));
if (!tmp)
return -ENOMEM;
@@ -136,13 +123,9 @@ int blk_init_by_fd(struct blkid_handle **h, int fd)
tmp->fd = fd;
*h = tmp;
r = 0;
#endif
return r;
return 0;
}
#ifdef HAVE_BLKID
static int blk_superblocks_luks(struct blkid_handle *h, bool enable)
{
char luks[] = "crypto_LUKS";
@@ -154,47 +137,34 @@ static int blk_superblocks_luks(struct blkid_handle *h, bool enable)
enable ? BLKID_FLTR_ONLYIN : BLKID_FLTR_NOTIN,
luks_filter);
}
#endif
int blk_superblocks_filter_luks(struct blkid_handle *h)
{
int r = -ENOTSUP;
#ifdef HAVE_BLKID
r = blk_superblocks_luks(h, false);
#endif
return r;
return blk_superblocks_luks(h, false);
}
int blk_superblocks_only_luks(struct blkid_handle *h)
{
int r = -ENOTSUP;
#ifdef HAVE_BLKID
r = blk_superblocks_luks(h, true);
#endif
return r;
return blk_superblocks_luks(h, true);
}
blk_probe_status blk_probe(struct blkid_handle *h)
{
blk_probe_status pr = PRB_FAIL;
#ifdef HAVE_BLKID
int r = blkid_do_probe(h->pr);
if (r == 0)
pr = PRB_OK;
else if (r == 1)
pr = PRB_EMPTY;
#endif
return pr;
}
blk_probe_status blk_safeprobe(struct blkid_handle *h)
{
int r = -1;
#ifdef HAVE_BLKID
r = blkid_do_safeprobe(h->pr);
#endif
switch (r) {
switch (blkid_do_safeprobe(h->pr)) {
case -2:
return PRB_AMBIGUOUS;
case 1:
@@ -208,43 +178,30 @@ blk_probe_status blk_safeprobe(struct blkid_handle *h)
int blk_is_partition(struct blkid_handle *h)
{
int r = 0;
#ifdef HAVE_BLKID
r = blkid_probe_has_value(h->pr, "PTTYPE");
#endif
return r;
return blkid_probe_has_value(h->pr, "PTTYPE");
}
int blk_is_superblock(struct blkid_handle *h)
{
int r = 0;
#ifdef HAVE_BLKID
r = blkid_probe_has_value(h->pr, "TYPE");
#endif
return r;
return blkid_probe_has_value(h->pr, "TYPE");;
}
const char *blk_get_partition_type(struct blkid_handle *h)
{
const char *value = NULL;
#ifdef HAVE_BLKID
(void) blkid_probe_lookup_value(h->pr, "PTTYPE", &value, NULL);
#endif
return value;
}
const char *blk_get_superblock_type(struct blkid_handle *h)
{
const char *value = NULL;
#ifdef HAVE_BLKID
(void) blkid_probe_lookup_value(h->pr, "TYPE", &value, NULL);
#endif
return value;
}
void blk_free(struct blkid_handle *h)
{
#ifdef HAVE_BLKID
if (!h)
return;
@@ -252,10 +209,8 @@ void blk_free(struct blkid_handle *h)
blkid_free_probe(h->pr);
free(h);
#endif
}
#ifdef HAVE_BLKID
#ifndef HAVE_BLKID_WIPE
static int blk_step_back(struct blkid_handle *h)
{
@@ -268,11 +223,9 @@ static int blk_step_back(struct blkid_handle *h)
#endif
}
#endif /* not HAVE_BLKID_WIPE */
#endif /* HAVE_BLKID */
int blk_do_wipe(struct blkid_handle *h)
{
#ifdef HAVE_BLKID
#ifdef HAVE_BLKID_WIPE
return blkid_do_wipe(h->pr, 0);
#else
@@ -319,29 +272,110 @@ int blk_do_wipe(struct blkid_handle *h)
return -EIO;
#endif
#else /* HAVE_BLKID */
return -ENOTSUP;
#endif
}
int blk_supported(void)
{
int r = 0;
#ifdef HAVE_BLKID
r = 1;
#endif
return r;
return 1;
}
unsigned blk_get_block_size(struct blkid_handle *h)
{
unsigned block_size = 0;
#ifdef HAVE_BLKID
const char *data;
if (!blk_is_superblock(h) || !blkid_probe_has_value(h->pr, "BLOCK_SIZE") ||
blkid_probe_lookup_value(h->pr, "BLOCK_SIZE", &data, NULL) ||
sscanf(data, "%u", &block_size) != 1)
block_size = 0;
#endif
return block_size;
}
#else /* HAVE_BLKID */
#pragma GCC diagnostic ignored "-Wunused-parameter"
void blk_set_chains_for_wipes(struct blkid_handle *h)
{
}
void blk_set_chains_for_full_print(struct blkid_handle *h)
{
}
void blk_set_chains_for_superblocks(struct blkid_handle *h)
{
}
void blk_set_chains_for_fast_detection(struct blkid_handle *h)
{
}
int blk_init_by_path(struct blkid_handle **h, const char *path)
{
return -ENOTSUP;
}
int blk_init_by_fd(struct blkid_handle **h, int fd)
{
return -ENOTSUP;
}
int blk_superblocks_filter_luks(struct blkid_handle *h)
{
return -ENOTSUP;
}
int blk_superblocks_only_luks(struct blkid_handle *h)
{
return -ENOTSUP;
}
blk_probe_status blk_probe(struct blkid_handle *h)
{
return PRB_FAIL;
}
blk_probe_status blk_safeprobe(struct blkid_handle *h)
{
return PRB_FAIL;
}
int blk_is_partition(struct blkid_handle *h)
{
return 0;
}
int blk_is_superblock(struct blkid_handle *h)
{
return 0;
}
const char *blk_get_partition_type(struct blkid_handle *h)
{
return NULL;
}
const char *blk_get_superblock_type(struct blkid_handle *h)
{
return NULL;
}
void blk_free(struct blkid_handle *h)
{
}
int blk_do_wipe(struct blkid_handle *h)
{
return -ENOTSUP;
}
int blk_supported(void)
{
return 0;
}
unsigned blk_get_block_size(struct blkid_handle *h)
{
return 0;
}
#endif