[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/7] error: De-duplicate code creating Error obj
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH 1/7] error: De-duplicate code creating Error objects |
Date: |
Mon, 22 Jun 2015 14:58:08 -0600 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 |
On 06/22/2015 01:26 PM, Markus Armbruster wrote:
> Duplicated when commit 680d16d added error_set_errno(), and again when
> commit 20840d4 added error_set_win32().
>
> Make the original copy in error_set() reusable by factoring out
> error_setv(), then rewrite error_set_errno() and error_set_win32() on
> top of it.
>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> util/error.c | 69
> ++++++++++++++++++++++--------------------------------------
> 1 file changed, 25 insertions(+), 44 deletions(-)
> @@ -96,37 +90,24 @@ void error_setg_file_open(Error **errp, int os_errno,
> const char *filename)
> void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
> const char *fmt, ...)
> {
> if (win32_err != 0) {
> - char *msg2 = g_win32_error_message(win32_err);
> - err->msg = g_strdup_printf("%s: %s (error: %x)", msg1, msg2,
> - (unsigned)win32_err);
> + msg1 = (*errp)->msg;
> + msg2 = g_win32_error_message(win32_err);
> + (*errp)->msg = g_strdup_printf("%s: %s", msg1, msg2);
Loses " (error: %x)". Do we care? I don't, except maybe in the commit
message...
Reviewed-by: Eric Blake <address@hidden>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-devel] [PATCH 0/7] error: On abort, report where the error was created, Markus Armbruster, 2015/06/22
- [Qemu-devel] [PATCH 1/7] error: De-duplicate code creating Error objects, Markus Armbruster, 2015/06/22
- Re: [Qemu-devel] [PATCH 1/7] error: De-duplicate code creating Error objects,
Eric Blake <=
- [Qemu-devel] [PATCH 5/7] error: error_set_errno() is unused, drop, Markus Armbruster, 2015/06/22
- [Qemu-devel] [PATCH 4/7] qga/vss-win32: Document the DLL requires non-null errp, Markus Armbruster, 2015/06/22
- [Qemu-devel] [PATCH 2/7] error: Make error_setg() a function, Markus Armbruster, 2015/06/22
- [Qemu-devel] [PATCH 6/7] error: Revamp interface documentation, Markus Armbruster, 2015/06/22
- [Qemu-devel] [PATCH 3/7] qga: Clean up unnecessarily dirty casts, Markus Armbruster, 2015/06/22