From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Jonathan Nieder <jrnieder@gmail.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [RFC/PATCH] headers: normalize the spelling of some header guards
Date: Sun, 14 Oct 2018 21:13:09 +0100 [thread overview]
Message-ID: <2804aa4e-c078-c981-be93-27e6e58b2042@ramsayjones.plus.com> (raw)
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Junio,
This patch is marked RFC because I am not aware of any policy with
regard to header guard spelling. Having said that, apart from the
fetch-negotiator.h header, all of these headers are using a reserved
identifier (see C99 Standard 7.1.3).
These headers were found, thus:
$ git grep -n -E '^#ifn?def ' -- '*.h' | grep 'h\:1\:' | grep -v '^compat' | grep -v -E '[A-Z_]*_H$'
alias.h:1:#ifndef __ALIAS_H__
commit-reach.h:1:#ifndef __COMMIT_REACH_H__
fetch-negotiator.h:1:#ifndef FETCH_NEGOTIATOR
midx.h:1:#ifndef __MIDX_H__
t/helper/test-tool.h:1:#ifndef __TEST_TOOL_H__
vcs-svn/fast_export.h:1:#ifndef FAST_EXPORT_H_
vcs-svn/line_buffer.h:1:#ifndef LINE_BUFFER_H_
vcs-svn/sliding_window.h:1:#ifndef SLIDING_WINDOW_H_
vcs-svn/svndiff.h:1:#ifndef SVNDIFF_H_
vcs-svn/svndump.h:1:#ifndef SVNDUMP_H_
$
Note that I haven't included the headers in vcs-svn because there is
a patch being discussed which would move that directory to contrib.
ATB,
Ramsay Jones
alias.h | 4 ++--
commit-reach.h | 4 ++--
fetch-negotiator.h | 4 ++--
midx.h | 4 ++--
t/helper/test-tool.h | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/alias.h b/alias.h
index 79933f2457..aef4843bb7 100644
--- a/alias.h
+++ b/alias.h
@@ -1,5 +1,5 @@
-#ifndef __ALIAS_H__
-#define __ALIAS_H__
+#ifndef ALIAS_H
+#define ALIAS_H
struct string_list;
diff --git a/commit-reach.h b/commit-reach.h
index 7d313e2975..122a23a24d 100644
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -1,5 +1,5 @@
-#ifndef __COMMIT_REACH_H__
-#define __COMMIT_REACH_H__
+#ifndef COMMIT_REACH_H
+#define COMMIT_REACH_H
#include "commit-slab.h"
diff --git a/fetch-negotiator.h b/fetch-negotiator.h
index ddb44a22dc..9e3967ce66 100644
--- a/fetch-negotiator.h
+++ b/fetch-negotiator.h
@@ -1,5 +1,5 @@
-#ifndef FETCH_NEGOTIATOR
-#define FETCH_NEGOTIATOR
+#ifndef FETCH_NEGOTIATOR_H
+#define FETCH_NEGOTIATOR_H
struct commit;
diff --git a/midx.h b/midx.h
index ce80b91c68..ee83702309 100644
--- a/midx.h
+++ b/midx.h
@@ -1,5 +1,5 @@
-#ifndef __MIDX_H__
-#define __MIDX_H__
+#ifndef MIDX_H
+#define MIDX_H
#include "repository.h"
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index e4890566da..71f470b871 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_TOOL_H__
-#define __TEST_TOOL_H__
+#ifndef TEST_TOOL_H
+#define TEST_TOOL_H
#include "git-compat-util.h"
--
2.19.0
next reply other threads:[~2018-10-14 20:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-14 20:13 Ramsay Jones [this message]
2018-10-14 23:17 ` [RFC/PATCH] headers: normalize the spelling of some header guards brian m. carlson
2018-10-14 23:59 ` Jeff King
2018-10-15 0:38 ` Ramsay Jones
2018-10-15 3:51 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2804aa4e-c078-c981-be93-27e6e58b2042@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).