summaryrefslogtreecommitdiffstats
path: root/util/id.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-09-30 13:59:30 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2014-10-03 10:30:33 +0100
commitf5bebbbb28dc7a149a891f0f1e112fb50bb72664 (patch)
tree8bf30a59e4ce61326a92cefc7d03036104bdb170 /util/id.c
parentd93162e13c1f4a5b2a4de6b1997f32e3fca19e67 (diff)
downloadhqemu-f5bebbbb28dc7a149a891f0f1e112fb50bb72664.zip
hqemu-f5bebbbb28dc7a149a891f0f1e112fb50bb72664.tar.gz
util: Emancipate id_wellformed() from QemuOpts
IDs have long spread beyond QemuOpts: not everything with an ID necessarily goes through QemuOpts. Commit 9aebf3b is about such a case: block layer names are meant to be well-formed IDs, but some of them don't go through QemuOpts, and thus weren't checked. The commit fixed that the straightforward way: rename the internal QemuOpts helper id_wellformed() to qemu_opts_id_wellformed() and give it external linkage. Instead of using it directly in block.c, the commit adds wrapper bdrv_is_valid_name(), probably to hide the connection to QemuOpts. Go one logical step further: emancipate IDs from QemuOpts. Rename the function back to id_wellformed(), and put it in another file. While there, clean up its value to bool. Peel off the bdrv_is_valid_name() wrapper. [Replaced stray return 0 with return false to match bool returns used elsewhere in id_wellformed(). --Stefan] Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'util/id.c')
-rw-r--r--util/id.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/util/id.c b/util/id.c
new file mode 100644
index 0000000..09b22fb
--- /dev/null
+++ b/util/id.c
@@ -0,0 +1,28 @@
+/*
+ * Dealing with identifiers
+ *
+ * Copyright (C) 2014 Red Hat, Inc.
+ *
+ * Authors:
+ * Markus Armbruster <armbru@redhat.com>,
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1
+ * or later. See the COPYING.LIB file in the top-level directory.
+ */
+
+#include "qemu-common.h"
+
+bool id_wellformed(const char *id)
+{
+ int i;
+
+ if (!qemu_isalpha(id[0])) {
+ return false;
+ }
+ for (i = 1; id[i]; i++) {
+ if (!qemu_isalnum(id[i]) && !strchr("-._", id[i])) {
+ return false;
+ }
+ }
+ return true;
+}
OpenPOWER on IntegriCloud