From patchwork Wed Nov 25 17:54:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Champetier X-Patchwork-Id: 548685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6A2D61402B8 for ; Thu, 26 Nov 2015 05:00:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=wT3QH1OL; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3212B28BF7B; Wed, 25 Nov 2015 18:56:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 12E5928BDBF for ; Wed, 25 Nov 2015 18:55:15 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 25 Nov 2015 18:55:03 +0100 (CET) Received: by wmec201 with SMTP id c201so80591449wme.1 for ; Wed, 25 Nov 2015 09:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6NE9Wq7x639gQrB/pSLPKgabi0RaivukJTlp7HUPkJg=; b=wT3QH1OLwdwjIPDBP7W82A0evs6LF4ASqN3NvgtCe3V/dUi5e5FgtzdsecZ1QZubxv slp64IM+dbuapfTIGI2nanuIw7U1aSybT25IzB9XBrKr852BmbbRIgmoLlySrK7cq1mw 2OIKuIE8N/e6blNLPFCEUU35RtGmF8pUrOTUncfYpebwqZTkOeOxI7aGG9/2B/JnHE97 q7FpCaXu2hL9WvzQYXMATwFvSfUccwmyWaDyW38skyQHhXVLURwfRq2mJngYkj06HLiw oPaOp9ZJXYkXp4pZvoTwQSAXo7bY3HDfwCyRCpux5bqbNyrlU47l9DevBfSfpZfHcLoJ P+rQ== X-Received: by 10.194.71.104 with SMTP id t8mr43326648wju.177.1448474103861; Wed, 25 Nov 2015 09:55:03 -0800 (PST) Received: from ubuntu1404.lxcnattst (ns623510.ovh.net. [5.135.134.9]) by smtp.gmail.com with ESMTPSA id cv3sm24180221wjc.20.2015.11.25.09.55.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Nov 2015 09:55:03 -0800 (PST) From: Etienne CHAMPETIER To: OpenWrt Development List Date: Wed, 25 Nov 2015 17:54:38 +0000 Message-Id: <1448474090-30280-6-git-send-email-champetier.etienne@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448474090-30280-1-git-send-email-champetier.etienne@gmail.com> References: <1448474090-30280-1-git-send-email-champetier.etienne@gmail.com> Subject: [OpenWrt-Devel] [PATCH procd v2 05/17] ujail: use "#pragma once" in .h where needed X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Etienne CHAMPETIER --- jail/capabilities.h | 1 + jail/elf.h | 4 +--- jail/log.h | 1 + jail/seccomp.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jail/capabilities.h b/jail/capabilities.h index e6699e9..beb67cc 100644 --- a/jail/capabilities.h +++ b/jail/capabilities.h @@ -10,5 +10,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#pragma once int drop_capabilities(const char *file); diff --git a/jail/elf.h b/jail/elf.h index ddbe234..82cbe14 100644 --- a/jail/elf.h +++ b/jail/elf.h @@ -10,8 +10,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#pragma once -#ifndef _ELF_H__ #include #include @@ -34,5 +34,3 @@ void alloc_library_path(const char *path); int elf_load_deps(const char *library); const char* find_lib(const char *file); void load_ldso_conf(const char *conf); - -#endif diff --git a/jail/log.h b/jail/log.h index b1d201e..89e797b 100644 --- a/jail/log.h +++ b/jail/log.h @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#pragma once extern int debug; #include diff --git a/jail/seccomp.h b/jail/seccomp.h index 45eede7..6540246 100644 --- a/jail/seccomp.h +++ b/jail/seccomp.h @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#pragma once #define INFO(fmt, ...) do { \ syslog(LOG_INFO,"preload-seccomp: "fmt, ## __VA_ARGS__); \