From patchwork Wed Mar 12 16:16:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26152 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f199.google.com (mail-yk0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B3C0E236AD for ; Wed, 12 Mar 2014 16:18:26 +0000 (UTC) Received: by mail-yk0-f199.google.com with SMTP id 200sf54727757ykr.2 for ; Wed, 12 Mar 2014 09:18:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=nGB2zkVMJB7dljSE3I/Qsl5gDNo/4H2bjhqeLaDNwbA=; b=SYvwNKzgDURgKFeGCtaGCOVBfvsviPBMlxtaNBeWoYJNlRndQqWq3PkStcY6NeNZG7 U7445oAvPgTkI1c8LXY6ZB1taVfZdMeMj+XN+pkqQqFsIl0Vj/uVYWYdG3lcGd1/QMll gLgB3yfXeOLICP+EwjxbIFnxXSdkFh7B0gZz+ULJBF1lBchEmmYlPNoOh7y7Haa3A2eo JvsKLEuFBF/d77Fbsddte9vEDvBNY6Jr3ar1reEO7y8knE169GddE5bTCwVws3H8G4cc t1xqvg3XSaFK/fj5qfN4teUg4KLAoB1KljryRzebhM+Y5hFfyz7MBEZxr25Fi2L0xeRQ TPTQ== X-Gm-Message-State: ALoCoQmIXG45OHZGGSsXggPsCqm+fuVpPEQhCO3BeZH4+PIqc/1qtfFexz1IteogGPOonxFchScJ X-Received: by 10.236.191.136 with SMTP id g8mr15657289yhn.48.1394641106507; Wed, 12 Mar 2014 09:18:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.161 with SMTP id o30ls3021052qga.94.gmail; Wed, 12 Mar 2014 09:18:26 -0700 (PDT) X-Received: by 10.52.8.225 with SMTP id u1mr144367vda.64.1394641106336; Wed, 12 Mar 2014 09:18:26 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id jl10si5222250veb.15.2014.03.12.09.18.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:18:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so10046676veb.25 for ; Wed, 12 Mar 2014 09:18:26 -0700 (PDT) X-Received: by 10.52.251.199 with SMTP id zm7mr23065949vdc.21.1394641106259; Wed, 12 Mar 2014 09:18:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp301400vck; Wed, 12 Mar 2014 09:18:26 -0700 (PDT) X-Received: by 10.52.35.196 with SMTP id k4mr684588vdj.38.1394641105868; Wed, 12 Mar 2014 09:18:25 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ke3si6954928veb.141.2014.03.12.09.18.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:18:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNlpd-0007OG-R7; Wed, 12 Mar 2014 16:16:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNlpa-0007K3-Ez for xen-devel@lists.xenproject.org; Wed, 12 Mar 2014 16:16:34 +0000 Received: from [85.158.137.68:15216] by server-8.bemta-3.messagelabs.com id 87/F3-21547-16880235; Wed, 12 Mar 2014 16:16:33 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-9.tower-31.messagelabs.com!1394640992!188816!1 X-Originating-IP: [74.125.82.42] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25223 invoked from network); 12 Mar 2014 16:16:32 -0000 Received: from mail-wg0-f42.google.com (HELO mail-wg0-f42.google.com) (74.125.82.42) by server-9.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 12 Mar 2014 16:16:32 -0000 Received: by mail-wg0-f42.google.com with SMTP id y10so11608275wgg.25 for ; Wed, 12 Mar 2014 09:16:32 -0700 (PDT) X-Received: by 10.194.174.197 with SMTP id bu5mr1949075wjc.71.1394640992100; Wed, 12 Mar 2014 09:16:32 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id dk9sm70840335wjb.4.2014.03.12.09.16.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Mar 2014 09:16:31 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 12 Mar 2014 16:16:03 +0000 Message-Id: <1394640969-25583-9-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> References: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Daniel De Graaf , Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [RFC 08/14] xen/xsm: flask: Rename variable "bool" in "b" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: On ARM, the compilation is failing with the following error: In file included from flask_op.c:21:0: ./include/conditional.h:24:43: error: two or more data types in declaration specifiers ./include/conditional.h:25:42: error: two or more data types in declaration specifiers Signed-off-by: Julien Grall Cc: Daniel De Graaf Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/include/conditional.h | 4 ++-- xen/xsm/flask/ss/services.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 043cfd8..9055340 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -21,7 +21,7 @@ int security_set_bools(int len, int *values); int security_find_bool(const char *name); -char *security_get_bool_name(unsigned int bool); -int security_get_bool_value(unsigned int bool); +char *security_get_bool_name(unsigned int b); +int security_get_bool_value(unsigned int b); #endif diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index aebbec7..59234ff 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1958,7 +1958,7 @@ out: return rc; } -int security_get_bool_value(unsigned int bool) +int security_get_bool_value(unsigned int b) { int rc = 0; unsigned int len; @@ -1966,19 +1966,19 @@ int security_get_bool_value(unsigned int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( b >= len ) { rc = -ENOENT; goto out; } - rc = policydb.bool_val_to_struct[bool]->state; + rc = policydb.bool_val_to_struct[b]->state; out: POLICY_RDUNLOCK; return rc; } -char *security_get_bool_name(unsigned int bool) +char *security_get_bool_name(unsigned int b) { unsigned int len; char *rv = NULL; @@ -1986,16 +1986,16 @@ char *security_get_bool_name(unsigned int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( b >= len ) { goto out; } - len = strlen(policydb.p_bool_val_to_name[bool]) + 1; + len = strlen(policydb.p_bool_val_to_name[b]) + 1; rv = xmalloc_array(char, len); if ( !rv ) goto out; - memcpy(rv, policydb.p_bool_val_to_name[bool], len); + memcpy(rv, policydb.p_bool_val_to_name[b], len); out: POLICY_RDUNLOCK; return rv;