From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Aguilar Subject: [PATCH] help: ensure that common-cmds.h is only included by help.c Date: Sat, 13 Sep 2014 18:11:13 -0700 Message-ID: <1410657073-3089-1-git-send-email-davvid@gmail.com> Cc: git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Sep 14 03:11:35 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XSyLn-000168-Gy for gcvg-git-2@plane.gmane.org; Sun, 14 Sep 2014 03:11:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244AbaINBLX (ORCPT ); Sat, 13 Sep 2014 21:11:23 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:53010 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752232AbaINBLW (ORCPT ); Sat, 13 Sep 2014 21:11:22 -0400 Received: by mail-pd0-f172.google.com with SMTP id v10so3857937pde.17 for ; Sat, 13 Sep 2014 18:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=CkCWRcKf51YJSyL9IAfBmqXL5Px1oEy3shykjEUUvd0=; b=JuiI8UcOrEvcEVuzOZjn3qjwf/RwVPHStH6PXxXNy9UHujtCFEgIJ7dL0sKNCLYm38 S0TTuDJclEVUYoKmw3S+M4RO9ZBq2hW42eX6/9mq7NrHEJdci+7xvqvrQzfqYReeq6b4 ueSQSjpYpHDwSMceOeV+6vGKSRVNXAZdiI8UBj/XpqLrgBD+bHQ+pOTgpMcvFDueqp3d cgL7chnn/avQ2uoF73Q2RN8ngIUm4VqZ/0Upq9qPjOCK+kJPoRXycT9zyxaVcVv2ch6p 57bQO4RX88C19cpIVprDwOPQjtVtgyqjEwROo1zJcui4Th4IMKeabJA/CSeDsuCemOc/ b74w== X-Received: by 10.68.143.100 with SMTP id sd4mr26527319pbb.76.1410657081783; Sat, 13 Sep 2014 18:11:21 -0700 (PDT) Received: from localhost.localdomain (208-106-56-2.static.sonic.net. [208.106.56.2]) by mx.google.com with ESMTPSA id p3sm7602134pde.35.2014.09.13.18.11.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 13 Sep 2014 18:11:21 -0700 (PDT) X-Mailer: git-send-email 2.1.0.241.ga16d620 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add a #ifndef guard to ensure that common-cmds.h can only be included by help.c. Suggested-by: Junio C Hamano Signed-off-by: David Aguilar --- generate-cmdlist.sh | 4 ++++ help.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index 9a4c9b9..99cd140 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -1,6 +1,10 @@ #!/bin/sh echo "/* Automatically generated by $0 */ +#ifndef GIT_HELP_INTERNAL +#error \"common-cmds.h can only be included by help.c\" +#endif + struct cmdname_help { char name[16]; char help[80]; diff --git a/help.c b/help.c index 7af65e2..abf1689 100644 --- a/help.c +++ b/help.c @@ -3,11 +3,12 @@ #include "exec_cmd.h" #include "levenshtein.h" #include "help.h" -#include "common-cmds.h" #include "string-list.h" #include "column.h" #include "version.h" #include "refs.h" +#define GIT_HELP_INTERNAL +#include "common-cmds.h" void add_cmdname(struct cmdnames *cmds, const char *name, int len) { -- 2.1.0.241.ga16d620