fix missing and misleading include guards

funbringer · funbringer · commit ab33a7e20602 · 2016-12-01T14:55:26.000+03:00
diff --git a/src/hooks.h b/src/hooks.h
@@ -8,8 +8,9 @@
  * ------------------------------------------------------------------------
  */
 
-#ifndef JOIN_HOOK_H
-#define JOIN_HOOK_H
+#ifndef PATHMAN_HOOKS_H
+#define PATHMAN_HOOKS_H
+
 
 #include "postgres.h"
 #include "optimizer/planner.h"
@@ -59,4 +60,5 @@ void pathman_process_utility_hook(Node *parsetree,
 								  DestReceiver *dest,
 								  char *completionTag);
 
-#endif
+
+#endif /* PATHMAN_HOOKS_H */
diff --git a/src/init.h b/src/init.h
@@ -11,6 +11,7 @@
 #ifndef PATHMAN_INIT_H
 #define PATHMAN_INIT_H
 
+
 #include "relation_info.h"
 
 #include "postgres.h"
@@ -147,4 +148,5 @@ bool read_pathman_params(Oid relid,
 						 Datum *values,
 						 bool *isnull);
 
-#endif
+
+#endif /* PATHMAN_INIT_H */
diff --git a/src/nodes_common.h b/src/nodes_common.h
@@ -11,6 +11,7 @@
 #ifndef NODES_COMMON_H
 #define NODES_COMMON_H
 
+
 #include "relation_info.h"
 
 #include "postgres.h"
@@ -100,4 +101,5 @@ void explain_append_common(CustomScanState *node,
 						   HTAB *children_table,
 						   ExplainState *es);
 
-#endif
+
+#endif /* NODES_COMMON_H */
diff --git a/src/partition_creation.h b/src/partition_creation.h
@@ -8,6 +8,10 @@
  *-------------------------------------------------------------------------
  */
 
+#ifndef PARTITION_CREATION_H
+#define PARTITION_CREATION_H
+
+
 #include "relation_info.h"
 
 #include "postgres.h"
@@ -137,3 +141,6 @@ typedef struct
 
 void invoke_part_callback(init_callback_params *cb_params);
 bool validate_part_callback(Oid procid, bool emit_error);
+
+
+#endif /* PARTITION_CREATION_H */
diff --git a/src/partition_filter.h b/src/partition_filter.h
@@ -8,8 +8,9 @@
  * ------------------------------------------------------------------------
  */
 
-#ifndef RUNTIME_INSERT_H
-#define RUNTIME_INSERT_H
+#ifndef PARTITION_FILTER_H
+#define PARTITION_FILTER_H
+
 
 #include "relation_info.h"
 #include "utils.h"
@@ -135,4 +136,5 @@ ResultRelInfoHolder * select_partition_for_insert(const PartRelationInfo *prel,
 												  Datum value, Oid value_type,
 												  EState *estate);
 
-#endif
+
+#endif /* PARTITION_FILTER_H */
diff --git a/src/pathman.h b/src/pathman.h
@@ -11,6 +11,7 @@
 #ifndef PATHMAN_H
 #define PATHMAN_H
 
+
 #include "relation_info.h"
 #include "rangeset.h"
 
@@ -193,4 +194,4 @@ WrapperNode *walk_expr_tree(Expr *expr, WalkerContext *context);
 	( DatumGetInt32(FunctionCall2((finfo), (arg1), (arg2))) > 0 )
 
 
-#endif   /* PATHMAN_H */
+#endif /* PATHMAN_H */
diff --git a/src/pathman_workers.h b/src/pathman_workers.h
@@ -17,6 +17,7 @@
 #ifndef PATHMAN_WORKERS_H
 #define PATHMAN_WORKERS_H
 
+
 #include "postgres.h"
 #include "storage/spin.h"
 
@@ -193,4 +194,5 @@ UnpackDatumFromByteArray(Datum *datum, Size datum_size, bool typbyval,
  */
 Oid create_partitions_for_value_bg_worker(Oid relid, Datum value, Oid value_type);
 
-#endif
+
+#endif /* PATHMAN_WORKERS_H */
diff --git a/src/pg_compat.h b/src/pg_compat.h
@@ -11,6 +11,7 @@
 #ifndef PG_COMPAT_H
 #define PG_COMPAT_H
 
+
 #include "postgres.h"
 
 #include "nodes/relation.h"
diff --git a/src/rangeset.h b/src/rangeset.h
@@ -143,4 +143,5 @@ List *irange_list_intersection(List *a, List *b);
 int irange_list_length(List *rangeset);
 bool irange_list_find(List *rangeset, int index, bool *lossy);
 
-#endif
+
+#endif /* PATHMAN_RANGESET_H */
diff --git a/src/relation_info.h b/src/relation_info.h
@@ -11,6 +11,7 @@
 #ifndef RELATION_INFO_H
 #define RELATION_INFO_H
 
+
 #include "postgres.h"
 #include "access/attnum.h"
 #include "port/atomics.h"
@@ -198,4 +199,5 @@ FreeRangesArray(PartRelationInfo *prel)
 	}
 }
 
-#endif
+
+#endif /* RELATION_INFO_H */
diff --git a/src/runtime_merge_append.h b/src/runtime_merge_append.h
@@ -13,6 +13,7 @@
 #ifndef RUNTIME_MERGE_APPEND_H
 #define RUNTIME_MERGE_APPEND_H
 
+
 #include "runtimeappend.h"
 #include "pathman.h"
 
@@ -78,4 +79,5 @@ void runtimemergeappend_explain(CustomScanState *node,
 								List *ancestors,
 								ExplainState *es);
 
-#endif
+
+#endif /* RUNTIME_MERGE_APPEND_H */
diff --git a/src/runtimeappend.h b/src/runtimeappend.h
@@ -11,6 +11,7 @@
 #ifndef RUNTIME_APPEND_H
 #define RUNTIME_APPEND_H
 
+
 #include "pathman.h"
 #include "nodes_common.h"
 
@@ -91,4 +92,5 @@ void runtimeappend_explain(CustomScanState *node,
 						   List *ancestors,
 						   ExplainState *es);
 
-#endif
+
+#endif /* RUNTIME_APPEND_H */
diff --git a/src/utility_stmt_hooking.h b/src/utility_stmt_hooking.h
@@ -30,4 +30,5 @@ void PathmanRenameConstraint(Oid partition_relid,
 							 AttrNumber partitioned_col,
 							 const RenameStmt *partition_rename_stmt);
 
-#endif
+
+#endif /* COPY_STMT_HOOKING_H */
diff --git a/src/utils.h b/src/utils.h
@@ -11,6 +11,7 @@
 #ifndef PATHMAN_UTILS_H
 #define PATHMAN_UTILS_H
 
+
 #include "pathman.h"
 
 #include "postgres.h"
@@ -56,4 +57,5 @@ void fill_type_cmp_fmgr_info(FmgrInfo *finfo, Oid type1, Oid type2);
 char * datum_to_cstring(Datum datum, Oid typid);
 Datum perform_type_cast(Datum value, Oid in_type, Oid out_type, bool *success);
 
-#endif
+
+#endif /* PATHMAN_UTILS_H */
diff --git a/src/xact_handling.h b/src/xact_handling.h
@@ -11,6 +11,7 @@
 #ifndef XACT_HANDLING_H
 #define XACT_HANDLING_H
 
+
 #include "pathman.h"
 
 #include "postgres.h"
@@ -33,4 +34,5 @@ bool xact_is_level_read_committed(void);
 bool xact_is_transaction_stmt(Node *stmt);
 bool xact_is_set_transaction_stmt(Node *stmt);
 
-#endif
+
+#endif /* XACT_HANDLING_H */

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`#ifndef RELATION_INFO_H`
`12`	`12`	`#define RELATION_INFO_H`
`13`	`13`
	`14`	`+`
`14`	`15`	`#include "postgres.h"`
`15`	`16`	`#include "access/attnum.h"`
`16`	`17`	`#include "port/atomics.h"`
`@@ -198,4 +199,5 @@ FreeRangesArray(PartRelationInfo *prel)`
`198`	`199`	`}`
`199`	`200`	`}`
`200`	`201`
`201`		`-#endif`
	`202`	`+`
	`203`	`+#endif /* RELATION_INFO_H */`