From: Karel Zak <kzak@redhat.com>
Date: Mon, 31 Oct 2022 11:55:14 +0000 (+0100)
Subject: libblkid: use blkid_probe_set_value() in more consistent way
X-Git-Tag: v2.39-rc1~452
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92385aaf573cf318b284152d96098dec903b2139;p=thirdparty%2Futil-linux.git

libblkid: use blkid_probe_set_value() in more consistent way

* use it if snprintf unnecessary
* use "const char" to be consistent

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index a34a446dc6..ae63a38cca 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -1144,7 +1144,7 @@ int blkid_partitions_set_ptuuid(blkid_probe pr, unsigned char *uuid)
 
 /* set PTUUID variable for non-binary API for tables where
  * the ID is just a string */
-int blkid_partitions_strcpy_ptuuid(blkid_probe pr, char *str)
+int blkid_partitions_strcpy_ptuuid(blkid_probe pr, const char *str)
 {
 	struct blkid_chain *chn = blkid_probe_get_chain(pr);
 
diff --git a/libblkid/src/partitions/partitions.h b/libblkid/src/partitions/partitions.h
index 4a718f4eaa..784e0c0e33 100644
--- a/libblkid/src/partitions/partitions.h
+++ b/libblkid/src/partitions/partitions.h
@@ -28,7 +28,7 @@ extern int blkid_partitions_do_subprobe(blkid_probe pr,
 
 extern int blkid_partitions_need_typeonly(blkid_probe pr);
 extern int blkid_partitions_set_ptuuid(blkid_probe pr, unsigned char *uuid);
-extern int blkid_partitions_strcpy_ptuuid(blkid_probe pr, char *str);
+extern int blkid_partitions_strcpy_ptuuid(blkid_probe pr, const char *str);
 
 
 extern int blkid_is_nested_dimension(blkid_partition par,
diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index 1c304bc2f6..01b941173b 100644
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -575,7 +575,7 @@ int blkid_probe_set_block_size(blkid_probe pr, unsigned block_size)
 static int blkid_probe_set_usage(blkid_probe pr, int usage)
 {
 	struct blkid_chain *chn = blkid_probe_get_chain(pr);
-	char *u = NULL;
+	const char *u = NULL;
 
 	if (!(chn->flags & BLKID_SUBLKS_USAGE))
 		return 0;
@@ -591,7 +591,8 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage)
 	else
 		u = "unknown";
 
-	return blkid_probe_set_value(pr, "USAGE", (unsigned char *) u, strlen(u) + 1);
+	return blkid_probe_set_value(pr, "USAGE",
+			(const unsigned char *) u, strlen(u) + 1);
 }
 
 int blkid_probe_set_fssize(blkid_probe pr, uint64_t size)
@@ -629,12 +630,11 @@ int blkid_probe_set_fsblocksize(blkid_probe pr, uint32_t block_size)
 int blkid_probe_set_fsendianness(blkid_probe pr, enum BLKID_ENDIANNESS endianness)
 {
 	struct blkid_chain *chn = blkid_probe_get_chain(pr);
+	const char *value;
 
 	if (!(chn->flags & BLKID_SUBLKS_FSINFO))
 		return 0;
 
-	const char *value;
-
 	switch (endianness) {
 		case BLKID_ENDIANNESS_LITTLE:
 			value = "LITTLE";
@@ -646,7 +646,9 @@ int blkid_probe_set_fsendianness(blkid_probe pr, enum BLKID_ENDIANNESS endiannes
 			return -EINVAL;
 	}
 
-	return blkid_probe_sprintf_value(pr, "ENDIANNESS", "%s", value);
+	return blkid_probe_set_value(pr, "ENDIANNESS",
+			(const unsigned char *) value, strlen(value) + 1);
+
 }
 
 int blkid_probe_set_id_label(blkid_probe pr, const char *name,