From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYe3q-0000q7-9n for qemu-devel@nongnu.org; Fri, 11 Apr 2014 12:12:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYe3k-0006FC-CD for qemu-devel@nongnu.org; Fri, 11 Apr 2014 12:12:14 -0400 Received: from mail-qa0-x235.google.com ([2607:f8b0:400d:c00::235]:39373) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYe3k-0006F4-2e for qemu-devel@nongnu.org; Fri, 11 Apr 2014 12:12:08 -0400 Received: by mail-qa0-f53.google.com with SMTP id w8so5374294qac.26 for ; Fri, 11 Apr 2014 09:12:07 -0700 (PDT) From: "Gabriel L. Somlo" Date: Fri, 11 Apr 2014 12:11:42 -0400 Message-Id: <1397232718-15282-3-git-send-email-somlo@cmu.edu> In-Reply-To: <1397232718-15282-1-git-send-email-somlo@cmu.edu> References: <1397232718-15282-1-git-send-email-somlo@cmu.edu> Subject: [Qemu-devel] [QEMU v5 PATCH 02/18] SMBIOS: Use macro to set smbios defaults List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kevin@koconnor.net, seabios@seabios.org, lersek@redhat.com, kraxel@redhat.com, agraf@suse.de The function smbios_set_defaults() uses a repeating code pattern for each field. This patch replaces that pattern with a macro. Signed-off-by: Gabriel Somlo --- hw/i386/smbios.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index 89dc070..f4ee7b4 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -256,18 +256,17 @@ static void smbios_build_type_1_fields(void) } } +#define SMBIOS_SET_DEFAULT(field, value) \ + if (!field) { \ + field = value; \ + } + void smbios_set_defaults(const char *manufacturer, const char *product, const char *version) { - if (!type1.manufacturer) { - type1.manufacturer = manufacturer; - } - if (!type1.product) { - type1.product = product; - } - if (!type1.version) { - type1.version = version; - } + SMBIOS_SET_DEFAULT(type1.manufacturer, manufacturer); + SMBIOS_SET_DEFAULT(type1.product, product); + SMBIOS_SET_DEFAULT(type1.version, version); } uint8_t *smbios_get_table(size_t *length) -- 1.9.0