From patchwork Wed Oct 3 14:36:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 188788 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BFCDF2C00BC for ; Thu, 4 Oct 2012 00:37:44 +1000 (EST) Received: from localhost ([::1]:54057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ50-00049I-SS for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 10:37:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4l-0003rD-3G for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ4f-0000DN-AE for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:27 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:39719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4f-0000Cn-3o for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:21 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so10061642pbb.4 for ; Wed, 03 Oct 2012 07:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=OaopfdEOB/LP2JH6IIg9mFb0K+mJXkKkJZgjDqCHgH8=; b=cYIE+BMARBicixzxhvUxVgv/ifSTCdsPbJxDWVZtJzCwgcmarAM39TDXc1kNNFNNxB YuFpMLfrHyHiQDng3AiKauM6HrzPl3TdZrU+fph7X40l2stLmtR8PLAPrya15q5iITDm eR35wvH91xdeASNuvlqdvMvFTOhlDIvBR3pRG8Tuy1a4JEucwouwZrIR9AU7NY8LwZdD yV+KL9CPOdhbHBkgaiPzLdejpOSQ08qut2mApwXR2vJO1CZzOxHbwef5Vs34m3XcuOpG NT2Ep/pEVTuDsTQB9n+RFpTo3v7/4BA1CjoAYwQhXXayLbMozq/N2bXKhWjkEfcA8bWx +V3Q== Received: by 10.68.234.71 with SMTP id uc7mr13414049pbc.72.1349275040719; Wed, 03 Oct 2012 07:37:20 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id i1sm2566228pay.26.2012.10.03.07.37.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Oct 2012 07:37:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2012 16:36:48 +0200 Message-Id: <1349275025-5093-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> References: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 01/18] error: add error_set_errno and error_setg_errno X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These functions help maintaining homogeneous formatting of error messages that include strerror values. Signed-off-by: Paolo Bonzini Acked-by: Luiz Capitulino --- error.c | 28 ++++++++++++++++++++++++++++ error.h | 9 +++++++++ 2 file modificati, 37 inserzioni(+) diff --git a/error.c b/error.c index 1f05fc4..128d88c 100644 --- a/error.c +++ b/error.c @@ -43,6 +43,34 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) *errp = err; } +void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, + const char *fmt, ...) +{ + Error *err; + char *msg1; + va_list ap; + + if (errp == NULL) { + return; + } + assert(*errp == NULL); + + err = g_malloc0(sizeof(*err)); + + va_start(ap, fmt); + msg1 = g_strdup_vprintf(fmt, ap); + if (os_errno != 0) { + err->msg = g_strdup_printf("%s: %s", msg1, strerror(os_errno)); + g_free(msg1); + } else { + err->msg = msg1; + } + va_end(ap); + err->err_class = err_class; + + *errp = err; +} + Error *error_copy(const Error *err) { Error *err_new; diff --git a/error.h b/error.h index da7fed3..4d52e73 100644 --- a/error.h +++ b/error.h @@ -30,10 +30,19 @@ typedef struct Error Error; void error_set(Error **err, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(3, 4); /** + * Set an indirect pointer to an error given a ErrorClass value and a + * printf-style human message, followed by a strerror() string if + * @os_error is not zero. + */ +void error_set_errno(Error **err, int os_error, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(4, 5); + +/** * Same as error_set(), but sets a generic error */ #define error_setg(err, fmt, ...) \ error_set(err, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__) +#define error_setg_errno(err, os_error, fmt, ...) \ + error_set_errno(err, os_error, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__) /** * Returns true if an indirect pointer to an error is pointing to a valid