[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/8] util: refactor qemu_open_old to split off variadic args handl
From: |
Daniel P . Berrangé |
Subject: |
[PULL 4/8] util: refactor qemu_open_old to split off variadic args handling |
Date: |
Wed, 16 Sep 2020 10:47:01 +0100 |
This simple refactoring prepares for future patches. The variadic args
handling is split from the main bulk of the open logic.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
util/osdep.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/util/osdep.c b/util/osdep.c
index 7504c156e8..11531e8f59 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -296,10 +296,10 @@ static int qemu_open_cloexec(const char *name, int flags,
mode_t mode)
/*
* Opens a file with FD_CLOEXEC set
*/
-int qemu_open_old(const char *name, int flags, ...)
+static int
+qemu_open_internal(const char *name, int flags, mode_t mode)
{
int ret;
- int mode = 0;
#ifndef _WIN32
const char *fdset_id_str;
@@ -324,15 +324,25 @@ int qemu_open_old(const char *name, int flags, ...)
}
#endif
- if (flags & O_CREAT) {
- va_list ap;
+ ret = qemu_open_cloexec(name, flags, mode);
+
+ return ret;
+}
+
- va_start(ap, flags);
+int qemu_open_old(const char *name, int flags, ...)
+{
+ va_list ap;
+ mode_t mode = 0;
+ int ret;
+
+ va_start(ap, flags);
+ if (flags & O_CREAT) {
mode = va_arg(ap, int);
- va_end(ap);
}
+ va_end(ap);
- ret = qemu_open_cloexec(name, flags, mode);
+ ret = qemu_open_internal(name, flags, mode);
#ifdef O_DIRECT
if (ret == -1 && errno == EINVAL && (flags & O_DIRECT)) {
--
2.26.2
- [PULL 0/8] Block odirect patches, Daniel P . Berrangé, 2020/09/16
- [PULL 1/8] monitor: simplify functions for getting a dup'd fdset entry, Daniel P . Berrangé, 2020/09/16
- [PULL 2/8] util: split off a helper for dealing with O_CLOEXEC flag, Daniel P . Berrangé, 2020/09/16
- [PULL 4/8] util: refactor qemu_open_old to split off variadic args handling,
Daniel P . Berrangé <=
- [PULL 3/8] util: rename qemu_open() to qemu_open_old(), Daniel P . Berrangé, 2020/09/16
- [PULL 5/8] util: add Error object for qemu_open_internal error reporting, Daniel P . Berrangé, 2020/09/16
- [PULL 6/8] util: introduce qemu_open and qemu_create with error reporting, Daniel P . Berrangé, 2020/09/16
- [PULL 7/8] util: give a specific error message when O_DIRECT doesn't work, Daniel P . Berrangé, 2020/09/16
- [PULL 8/8] block/file: switch to use qemu_open/qemu_create for improved errors, Daniel P . Berrangé, 2020/09/16
- Re: [PULL 0/8] Block odirect patches, Peter Maydell, 2020/09/17