mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib: rename VALID_FORMAT_IFACE to VALID_FORMAT

Browse Source 
We no longer use VALID_FORMAT_IFACE for validating "iface"; rename the
macro to reflect that we only check "format" with it.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844341
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20220504134155.11832-4-lersek@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
This commit is contained in:
Laszlo Ersek
2022-05-04 15:41:54 +02:00
parent f68eaee1d6
commit c8e3caf9e6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/drives.c
View File

@@ -593,7 +593,7 @@ guestfs_int_free_drives (guestfs_h *g)
* Check string parameter matches regular expression
* C<^[-_[:alnum:]]+$> (in C locale).
*/
#define VALID_FORMAT_IFACE(str) \
#define VALID_FORMAT(str) \
guestfs_int_string_is_valid ((str), 1, 0, \
VALID_FLAG_ALPHA|VALID_FLAG_DIGIT, "-_")
@@ -790,7 +790,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
return -1;
}
if (data.format && !VALID_FORMAT_IFACE (data.format)) {
if (data.format && !VALID_FORMAT (data.format)) {
error (g, _("%s parameter is empty or contains disallowed characters"),
"format");
free_drive_servers (data.servers, data.nr_servers);

16
lib/unit-tests.c
View File

@@ -434,7 +434,7 @@ test_stringsbuf (void)
}
/* Use the same macros as in lib/drives.c */
#define VALID_FORMAT_IFACE(str) \
#define VALID_FORMAT(str) \
guestfs_int_string_is_valid ((str), 1, 0, \
VALID_FLAG_ALPHA|VALID_FLAG_DIGIT, "-_")
#define VALID_DISK_LABEL(str) \
@@ -446,18 +446,18 @@ test_stringsbuf (void)
static void
test_valid (void)
{
assert (!VALID_FORMAT_IFACE (""));
assert (!VALID_FORMAT (""));
assert (!VALID_DISK_LABEL (""));
assert (!VALID_HOSTNAME (""));
assert (!VALID_DISK_LABEL ("012345678901234567890"));
assert (VALID_FORMAT_IFACE ("abc"));
assert (VALID_FORMAT_IFACE ("ABC"));
assert (VALID_FORMAT_IFACE ("abc123"));
assert (VALID_FORMAT_IFACE ("abc123-"));
assert (VALID_FORMAT_IFACE ("abc123_"));
assert (!VALID_FORMAT_IFACE ("abc123."));
assert (VALID_FORMAT ("abc"));
assert (VALID_FORMAT ("ABC"));
assert (VALID_FORMAT ("abc123"));
assert (VALID_FORMAT ("abc123-"));
assert (VALID_FORMAT ("abc123_"));
assert (!VALID_FORMAT ("abc123."));
assert (VALID_DISK_LABEL ("abc"));
assert (VALID_DISK_LABEL ("ABC"));