From patchwork Fri Dec 14 00:15:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10730135 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E36F013BF for ; Fri, 14 Dec 2018 00:15:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5E512CDFD for ; Fri, 14 Dec 2018 00:15:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA31C2CEF2; Fri, 14 Dec 2018 00:15:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E6A82CDFD for ; Fri, 14 Dec 2018 00:15:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728388AbeLNAPx (ORCPT ); Thu, 13 Dec 2018 19:15:53 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:43115 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727042AbeLNAPx (ORCPT ); Thu, 13 Dec 2018 19:15:53 -0500 Received: by mail-ed1-f67.google.com with SMTP id f9so3529580eds.10 for ; Thu, 13 Dec 2018 16:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CyvMTrPOrHXwpXEhWe63Tju4MCJw1qECGhxt5wQlSKA=; b=WQeE1C0/jx21M7IiJ9qlUct7AwssMqOOmqay92eCfeD+VM7BGjQ+HZK5ucxjzI68yN mbqaZHAU+6fyrOxXASMNw24jc+j0fg9Wb0XRx7y9Rja6GffFCCparlO0D8E5eYNJuCrY 3ckQiB7tY8njWB8qn9V+L0DI4qlyXY5QEkGCOoX9qbu5ihXPdbI6qV7m1+99CNJzu4iE +loSWF35TQyITqM8g0m1i0W9F9KWb4R49daXnDHH/knnYlbDI3UioKI5F3oECO61o4Ve DJ2dDBOrMEtP4PCb+CkhAcF7+9fN10p82RAQhwqiGx/xOnZbHgpS/FHzdW//NIt3J7Ee PWxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CyvMTrPOrHXwpXEhWe63Tju4MCJw1qECGhxt5wQlSKA=; b=ndk3BzuUZPGKKyw17FEX8nM2Isl7qdiCdl1+cI6oEVDRgMY5IwpiXlDLIzxNS8pAhg eTVb1gs1DnnPe0gxyLuKRu20SoAxs9fJNfhMtpgnQN1P7L3dPrNJbCb/4QA0FdUUfx90 VCiF2k0YrE+/IHufBjK4m1oJlyghPyp9jMhFEdd4ziIl+t9pg4z+qMMg5sIyHkfeJ+Av F1dmopFCB18O6IWG05PLUp9AN7ZPAV6pOguXWe+014q7JhhERJ/QrTLOlPkw+OG8y6by MPdXadXHJbR1mmRGVUQcqgMvGAXB5ykl1y/P2CfOYmOxgEEKOR+bLeYGoC6raJtuQirs cMkA== X-Gm-Message-State: AA+aEWZlTRVVb37RMIoJhlyO89aUpPVVtx9XGkjO6mTzXcVxltAFGGEE 1uoOJJdPV9SZFFw4M+Y2rFoUiEac X-Google-Smtp-Source: AFSGD/UZJyqSU30VYJTM9q2qjxw5VMRaPvJOR31r26+RbJnj7OARN6dljaSX7zC/r4nUoo6eNIdGXw== X-Received: by 2002:a50:f489:: with SMTP id s9mr1042070edm.101.1544746550800; Thu, 13 Dec 2018 16:15:50 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:4081:8a00:5930:404c:ddbe:1aaf]) by smtp.gmail.com with ESMTPSA id f20sm986489edf.19.2018.12.13.16.15.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 16:15:50 -0800 (PST) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Ramsay Jones , Luc Van Oostenryck Subject: [PATCH v3 06/19] allow optional "_T" suffix to __SIZEOF_XXX__ Date: Fri, 14 Dec 2018 01:15:23 +0100 Message-Id: <20181214001536.6259-7-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181214001536.6259-1-luc.vanoostenryck@gmail.com> References: <20181214001536.6259-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.0 Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This allows to be more generic. Signed-off-by: Luc Van Oostenryck --- lib.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib.c b/lib.c index 9d3ac2afd..70c5c72bb 100644 --- a/lib.c +++ b/lib.c @@ -1124,11 +1124,11 @@ static char **handle_switch(char *arg, char **next) return next; } -static void predefined_sizeof(const char *name, unsigned bits) +static void predefined_sizeof(const char *name, const char *suffix, unsigned bits) { char buf[32]; - snprintf(buf, sizeof(buf), "__SIZEOF_%s__", name); + snprintf(buf, sizeof(buf), "__SIZEOF_%s%s__", name, suffix); predefine(buf, 1, "%d", bits/8); } @@ -1152,7 +1152,7 @@ static void predefined_max(const char *name, const char *suffix, unsigned bits) static void predefined_type_size(const char *name, const char *suffix, unsigned bits) { predefined_max(name, suffix, bits); - predefined_sizeof(name, bits); + predefined_sizeof(name, "", bits); predefined_width(name, bits); } @@ -1203,12 +1203,12 @@ static void predefined_macros(void) break; } - predefined_sizeof("SHORT", bits_in_short); + predefined_sizeof("SHORT", "", bits_in_short); predefined_max("SHRT", "", bits_in_short); predefined_width("SHRT", bits_in_short); predefined_max("SCHAR", "", bits_in_char); predefined_width("SCHAR", bits_in_char); - predefined_sizeof("WCHAR_T",bits_in_wchar); + predefined_sizeof("WCHAR", "_T", bits_in_wchar); predefined_max("WCHAR", "", bits_in_wchar); predefined_width("WCHAR", bits_in_wchar); predefine("__CHAR_BIT__", 1, "%d", bits_in_char); @@ -1217,17 +1217,17 @@ static void predefined_macros(void) predefined_type_size("LONG", "L", bits_in_long); predefined_type_size("LONG_LONG", "LL", bits_in_longlong); - predefined_sizeof("INT128", 128); + predefined_sizeof("INT128", "", 128); - predefined_sizeof("SIZE_T", bits_in_pointer); + predefined_sizeof("SIZE", "_T", bits_in_pointer); predefined_width( "SIZE", bits_in_pointer); - predefined_sizeof("PTRDIFF_T", bits_in_pointer); + predefined_sizeof("PTRDIFF", "_T", bits_in_pointer); predefined_width( "PTRDIFF", bits_in_pointer); - predefined_sizeof("POINTER", bits_in_pointer); + predefined_sizeof("POINTER", "", bits_in_pointer); - predefined_sizeof("FLOAT", bits_in_float); - predefined_sizeof("DOUBLE", bits_in_double); - predefined_sizeof("LONG_DOUBLE", bits_in_longdouble); + predefined_sizeof("FLOAT", "", bits_in_float); + predefined_sizeof("DOUBLE", "", bits_in_double); + predefined_sizeof("LONG_DOUBLE", "", bits_in_longdouble); predefine("__ORDER_LITTLE_ENDIAN__", 1, "1234"); predefine("__ORDER_BIG_ENDIAN__", 1, "4321");