From 6928d9d0a8f26e966f514f4e93c9a5a67f39c64b Mon Sep 17 00:00:00 2001
From: jkar8572 <jkar8572>
Date: Wed, 6 Jan 2010 11:03:39 +0000
Subject: Fixed some forgotten identifiers from reserved namespace. Added
 GUARD_ prefix to the guarding defines.

---
 common.h          | 6 +++---
 dqblk_rpc.h       | 4 ++--
 dqblk_v1.h        | 4 ++--
 dqblk_v2.h        | 4 ++--
 dqblk_xfs.h       | 4 ++--
 mntopt.h          | 4 ++--
 pot.h             | 4 ++--
 quota.h           | 4 ++--
 quota_tree.h      | 4 ++--
 quotacheck.h      | 4 ++--
 quotaio.h         | 6 +++---
 quotaio_generic.h | 4 ++--
 quotaio_v1.h      | 4 ++--
 quotaio_v2.h      | 4 ++--
 quotaio_xfs.h     | 6 +++---
 quotaops.h        | 6 +++---
 quotasys.h        | 6 +++---
 rquota_client.h   | 4 ++--
 18 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/common.h b/common.h
index 131a82d..8b04e55 100644
--- a/common.h
+++ b/common.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef GUARD_COMMON_H
+#define GUARD_COMMON_H
 
 #ifndef __attribute__
 # if !defined __GNUC__ || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
@@ -46,4 +46,4 @@ char *sstrdup(const char *s);
 /* Print version string */
 void version(void);
 
-#endif /* COMMON_H */
+#endif /* GUARD_COMMON_H */
diff --git a/dqblk_rpc.h b/dqblk_rpc.h
index ff2b0b4..55d7d65 100644
--- a/dqblk_rpc.h
+++ b/dqblk_rpc.h
@@ -2,8 +2,8 @@
  *	Headerfile for rpc quotafile format
  */
 
-#ifndef DQBLK_RPC_H
-#define DQBLK_RPC_H
+#ifndef GUARD_DQBLK_RPC_H
+#define GUARD_DQBLK_RPC_H
 
 /* Values used for communication through network */
 #define Q_RPC_GETQUOTA	0x0300	/* get limits and usage */
diff --git a/dqblk_v1.h b/dqblk_v1.h
index fe3d683..7113261 100644
--- a/dqblk_v1.h
+++ b/dqblk_v1.h
@@ -2,8 +2,8 @@
  *	Headerfile for old quotafile format
  */
 
-#ifndef _DQBLK_V1_H
-#define _DQBLK_V1_H
+#ifndef GUARD_DQBLK_V1_H
+#define GUARD_DQBLK_V1_H
 
 /* Values of quota calls */
 #define Q_V1_RSQUASH	0x1000
diff --git a/dqblk_v2.h b/dqblk_v2.h
index d71baf0..c06168d 100644
--- a/dqblk_v2.h
+++ b/dqblk_v2.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef _DQBLK_V2_H
-#define _DQBLK_V2_H
+#ifndef GUARD_DQBLK_V2_H
+#define GUARD_DQBLK_V2_H
 
 #include <sys/types.h>
 #include "quota_tree.h"
diff --git a/dqblk_xfs.h b/dqblk_xfs.h
index 6d5418e..415e646 100644
--- a/dqblk_xfs.h
+++ b/dqblk_xfs.h
@@ -2,8 +2,8 @@
  *	Headerfile for XFS quota format
  */
 
-#ifndef DQBLK_XFS_H
-#define DQBLK_XFS_H
+#ifndef GUARD_DQBLK_XFS_H
+#define GUARD_DQBLK_XFS_H
 
 #include "quotaio_xfs.h"
 
diff --git a/mntopt.h b/mntopt.h
index 81a363d..90673fc 100644
--- a/mntopt.h
+++ b/mntopt.h
@@ -1,5 +1,5 @@
-#ifndef MNTOPT_H
-#define MNTOPT_H
+#ifndef GUARD_MNTOPT_H
+#define GUARD_MNTOPT_H
 
 #include <mntent.h>
 
diff --git a/pot.h b/pot.h
index 0ab76d4..a825c03 100644
--- a/pot.h
+++ b/pot.h
@@ -1,5 +1,5 @@
-#ifndef POT_H
-#define POT_H
+#ifndef GUARD_POT_H
+#define GUARD_POT_H
 
 #ifdef USE_GETTEXT
 
diff --git a/quota.h b/quota.h
index 8125df7..565fc7e 100644
--- a/quota.h
+++ b/quota.h
@@ -1,5 +1,5 @@
-#ifndef QUOTA_H
-#define QUOTA_H
+#ifndef GUARD_QUOTA_H
+#define GUARD_QUOTA_H
 
 #include <sys/types.h>
 
diff --git a/quota_tree.h b/quota_tree.h
index ed04520..32fce65 100644
--- a/quota_tree.h
+++ b/quota_tree.h
@@ -1,5 +1,5 @@
-#ifndef QUOTA_TREE_H
-#define QUOTA_TREE_H
+#ifndef GUARD_QUOTA_TREE_H
+#define GUARD_QUOTA_TREE_H
 
 #include <sys/types.h>
 #include "quota.h"
diff --git a/quotacheck.h b/quotacheck.h
index 351310b..0abdaaa 100644
--- a/quotacheck.h
+++ b/quotacheck.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef QUOTACHECK_H
-#define QUOTACHECK_H
+#ifndef GUARD_QUOTACHECK_H
+#define GUARD_QUOTACHECK_H
 
 #include <sys/types.h>
 
diff --git a/quotaio.h b/quotaio.h
index 014f824..2ee734a 100644
--- a/quotaio.h
+++ b/quotaio.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef QUOTAIO_H
-#define QUOTAIO_H
+#ifndef GUARD_QUOTAIO_H
+#define GUARD_QUOTAIO_H
 
 #include <limits.h>
 #include <sys/types.h>
@@ -170,4 +170,4 @@ int end_io(struct quota_handle *h);
 /* Get empty quota structure */
 struct dquot *get_empty_dquot(void);
 
-#endif /* QUOTAIO_H */
+#endif /* GUARD_QUOTAIO_H */
diff --git a/quotaio_generic.h b/quotaio_generic.h
index c739449..422fb52 100644
--- a/quotaio_generic.h
+++ b/quotaio_generic.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef QUOTAIO_GENERIC_H
-#define QUOTAIO_GENERIC_H
+#ifndef GUARD_QUOTAIO_GENERIC_H
+#define GUARD_QUOTAIO_GENERIC_H
 
 #include "quotaio.h"
 
diff --git a/quotaio_v1.h b/quotaio_v1.h
index fd4475e..b74290b 100644
--- a/quotaio_v1.h
+++ b/quotaio_v1.h
@@ -2,8 +2,8 @@
  *	Headerfile for old quotafile format
  */
 
-#ifndef _QUOTAIO_V1_H
-#define _QUOTAIO_V1_H
+#ifndef GUARD_QUOTAIO_V1_H
+#define GUARD_QUOTAIO_V1_H
 
 #include <sys/types.h>
 
diff --git a/quotaio_v2.h b/quotaio_v2.h
index 092f22f..197bb65 100644
--- a/quotaio_v2.h
+++ b/quotaio_v2.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef _QUOTAIO_V2_H
-#define _QUOTAIO_V2_H
+#ifndef GUARD_QUOTAIO_V2_H
+#define GUARD_QUOTAIO_V2_H
 
 #include <sys/types.h>
 #include "quota.h"
diff --git a/quotaio_xfs.h b/quotaio_xfs.h
index ac84d8d..cf89973 100644
--- a/quotaio_xfs.h
+++ b/quotaio_xfs.h
@@ -29,8 +29,8 @@
  *
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
-#ifndef QUOTAIO_XFS_H
-#define QUOTAIO_XFS_H
+#ifndef GUARD_QUOTAIO_XFS_H
+#define GUARD_QUOTAIO_XFS_H
 
 #include <asm/types.h>
 
@@ -147,4 +147,4 @@ typedef struct fs_quota_stat {
 	__u16 qs_iwarnlimit;	/* limit for num warnings */
 } fs_quota_stat_t;
 
-#endif /* QUOTAIO_XFS_H */
+#endif /* GUARD_QUOTAIO_XFS_H */
diff --git a/quotaops.h b/quotaops.h
index f5de7dd..acd8d30 100644
--- a/quotaops.h
+++ b/quotaops.h
@@ -1,5 +1,5 @@
-#ifndef QUOTAOPS_H
-#define QUOTAOPS_H
+#ifndef GUARD_QUOTAOPS_H
+#define GUARD_QUOTAOPS_H
 
 #include "quotaio.h"
 
@@ -15,4 +15,4 @@ int readtimes(struct quota_handle ** handles, int infd);
 void freeprivs(struct dquot * qlist);
 void update_grace_times(struct dquot *q);
 
-#endif /* QUOTAOPS_H */
+#endif /* GUARD_QUOTAOPS_H */
diff --git a/quotasys.h b/quotasys.h
index b75652a..90e5aae 100644
--- a/quotasys.h
+++ b/quotasys.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef QUOTASYS_H
-#define QUOTASYS_H
+#ifndef GUARD_QUOTASYS_H
+#define GUARD_QUOTASYS_H
 
 #include <sys/types.h>
 #include "mntopt.h"
@@ -146,4 +146,4 @@ struct mntent *get_next_mount(void);
 /* Free all structures associated with mountpoints scan */
 void end_mounts_scan(void);
 
-#endif /* QUOTASYS_H */
+#endif /* GUARD_QUOTASYS_H */
diff --git a/rquota_client.h b/rquota_client.h
index 292af19..3730a8d 100644
--- a/rquota_client.h
+++ b/rquota_client.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef RQUOTA_CLIENT_H
-#define RQUOTA_CLIENT_H
+#ifndef GUARD_RQUOTA_CLIENT_H
+#define GUARD_RQUOTA_CLIENT_H
 
 #include "quotaio.h"
 
-- 
cgit v1.2.3