From 6ac74c0c883983329e958a1e0580ecde29985c76 Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Fri, 13 Apr 2018 16:27:33 -0400
Subject: [PATCH] include/babeltrace/graph: fix some include guards

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
 include/babeltrace/graph/component-class-internal.h         | 6 +++---
 include/babeltrace/graph/component-filter-internal.h        | 6 +++---
 include/babeltrace/graph/component-internal.h               | 6 +++---
 include/babeltrace/graph/component-sink-internal.h          | 6 +++---
 include/babeltrace/graph/component-source-internal.h        | 6 +++---
 include/babeltrace/graph/connection-internal.h              | 6 +++---
 include/babeltrace/graph/graph-internal.h                   | 6 +++---
 .../graph/notification-discarded-elements-internal.h        | 6 +++---
 include/babeltrace/graph/notification-event-internal.h      | 6 +++---
 include/babeltrace/graph/notification-heap-internal.h       | 6 +++---
 include/babeltrace/graph/notification-inactivity-internal.h | 6 +++---
 include/babeltrace/graph/notification-internal.h            | 6 +++---
 include/babeltrace/graph/notification-iterator-internal.h   | 6 +++---
 include/babeltrace/graph/notification-packet-internal.h     | 6 +++---
 include/babeltrace/graph/notification-stream-internal.h     | 6 +++---
 include/babeltrace/graph/port-internal.h                    | 6 +++---
 include/babeltrace/graph/private-component-filter.h         | 6 +++---
 17 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/include/babeltrace/graph/component-class-internal.h b/include/babeltrace/graph/component-class-internal.h
index c8f95d31..66d920d6 100644
--- a/include/babeltrace/graph/component-class-internal.h
+++ b/include/babeltrace/graph/component-class-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_CLASS_INTERNAL_H
-#define BABELTRACE_COMPONENT_COMPONENT_CLASS_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_CLASS_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_CLASS_INTERNAL_H
 
 /*
  * BabelTrace - Component Class Internal
@@ -119,4 +119,4 @@ const char *bt_component_class_type_string(enum bt_component_class_type type)
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_CLASS_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_CLASS_INTERNAL_H */
diff --git a/include/babeltrace/graph/component-filter-internal.h b/include/babeltrace/graph/component-filter-internal.h
index 38a1a240..08caef0e 100644
--- a/include/babeltrace/graph/component-filter-internal.h
+++ b/include/babeltrace/graph/component-filter-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_FILTER_INTERNAL_H
-#define BABELTRACE_COMPONENT_FILTER_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_FILTER_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_FILTER_INTERNAL_H
 
 /*
  * BabelTrace - Filter Component Internal
@@ -51,4 +51,4 @@ struct bt_component *bt_component_filter_create(
 BT_HIDDEN
 void bt_component_filter_destroy(struct bt_component *component);
 
-#endif /* BABELTRACE_COMPONENT_FILTER_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_FILTER_INTERNAL_H */
diff --git a/include/babeltrace/graph/component-internal.h b/include/babeltrace/graph/component-internal.h
index 540faf4c..f742c7b1 100644
--- a/include/babeltrace/graph/component-internal.h
+++ b/include/babeltrace/graph/component-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
-#define BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
 
 /*
  * BabelTrace - Component internal
@@ -185,4 +185,4 @@ const char *bt_component_status_string(enum bt_component_status status)
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_INTERNAL_H */
diff --git a/include/babeltrace/graph/component-sink-internal.h b/include/babeltrace/graph/component-sink-internal.h
index c1e7a454..34c899c1 100644
--- a/include/babeltrace/graph/component-sink-internal.h
+++ b/include/babeltrace/graph/component-sink-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_SINK_INTERNAL_H
-#define BABELTRACE_COMPONENT_SINK_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_SINK_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_SINK_INTERNAL_H
 
 /*
  * BabelTrace - Sink Component internal
@@ -64,4 +64,4 @@ BT_HIDDEN
 enum bt_component_status bt_component_sink_consume(
 		struct bt_component *component);
 
-#endif /* BABELTRACE_COMPONENT_SINK_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_SINK_INTERNAL_H */
diff --git a/include/babeltrace/graph/component-source-internal.h b/include/babeltrace/graph/component-source-internal.h
index 98b523ce..37e6d934 100644
--- a/include/babeltrace/graph/component-source-internal.h
+++ b/include/babeltrace/graph/component-source-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_SOURCE_INTERNAL_H
-#define BABELTRACE_COMPONENT_SOURCE_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_SOURCE_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_SOURCE_INTERNAL_H
 
 /*
  * BabelTrace - Source Component internal
@@ -51,4 +51,4 @@ struct bt_component *bt_component_source_create(
 BT_HIDDEN
 void bt_component_source_destroy(struct bt_component *component);
 
-#endif /* BABELTRACE_COMPONENT_SOURCE_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_SOURCE_INTERNAL_H */
diff --git a/include/babeltrace/graph/connection-internal.h b/include/babeltrace/graph/connection-internal.h
index 21dd59a3..366dc0e4 100644
--- a/include/babeltrace/graph/connection-internal.h
+++ b/include/babeltrace/graph/connection-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_CONNECTION_INTERNAL_H
-#define BABELTRACE_COMPONENT_CONNECTION_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_CONNECTION_INTERNAL_H
+#define BABELTRACE_GRAPH_CONNECTION_INTERNAL_H
 
 /*
  * BabelTrace - Component Connection Internal
@@ -145,4 +145,4 @@ const char *bt_connection_status_string(enum bt_connection_status status)
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_CONNECTION_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_CONNECTION_INTERNAL_H */
diff --git a/include/babeltrace/graph/graph-internal.h b/include/babeltrace/graph/graph-internal.h
index c8be19aa..cd1b557d 100644
--- a/include/babeltrace/graph/graph-internal.h
+++ b/include/babeltrace/graph/graph-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_GRAPH_INTERNAL_H
-#define BABELTRACE_COMPONENT_COMPONENT_GRAPH_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_GRAPH_INTERNAL_H
+#define BABELTRACE_GRAPH_GRAPH_INTERNAL_H
 
 /*
  * BabelTrace - Component Graph Internal
@@ -190,4 +190,4 @@ enum bt_graph_status bt_graph_status_from_component_status(
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_GRAPH_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_GRAPH_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-discarded-elements-internal.h b/include/babeltrace/graph/notification-discarded-elements-internal.h
index 3dbc6368..9697525c 100644
--- a/include/babeltrace/graph/notification-discarded-elements-internal.h
+++ b/include/babeltrace/graph/notification-discarded-elements-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_DISCARDED_ELEMENTS_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_DISCARDED_ELEMENTS_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_DISCARDED_ELEMENTS_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_DISCARDED_ELEMENTS_INTERNAL_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -83,4 +83,4 @@ struct bt_stream *bt_notification_discarded_elements_borrow_stream(
 	return discarded_elems_notif->stream;
 }
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_DISCARDED_ELEMENTS_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_DISCARDED_ELEMENTS_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-event-internal.h b/include/babeltrace/graph/notification-event-internal.h
index 5447a9a0..62b8a3ab 100644
--- a/include/babeltrace/graph/notification-event-internal.h
+++ b/include/babeltrace/graph/notification-event-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_EVENT_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_EVENT_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_EVENT_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_EVENT_INTERNAL_H
 
 /*
  * BabelTrace - Plug-in Event Notification internal
@@ -71,4 +71,4 @@ bt_notification_event_borrow_clock_class_priority_map(
 }
 #endif
 
-#endif /* BABELTRACECOMPONENTPLUGIN_NOTIFICATION_EVENT_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_EVENT_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-heap-internal.h b/include/babeltrace/graph/notification-heap-internal.h
index 07e13789..a93c5fb2 100644
--- a/include/babeltrace/graph/notification-heap-internal.h
+++ b/include/babeltrace/graph/notification-heap-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_HEAP_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_HEAP_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_HEAP_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_HEAP_INTERNAL_H
 
 /*
  * Babeltrace - CTF notification heap priority heap
@@ -38,4 +38,4 @@ struct bt_notification_heap {
 	void *compare_data;
 };
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_HEAP_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_HEAP_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-inactivity-internal.h b/include/babeltrace/graph/notification-inactivity-internal.h
index f3ae2e41..62fba00e 100644
--- a/include/babeltrace/graph/notification-inactivity-internal.h
+++ b/include/babeltrace/graph/notification-inactivity-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_INACTIVITY_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_INACTIVITY_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_INACTIVITY_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_INACTIVITY_INTERNAL_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -33,4 +33,4 @@ struct bt_notification_inactivity {
 	GHashTable *clock_values;
 };
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_INACTIVITY_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_INACTIVITY_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index d1149055..2fbdbb42 100644
--- a/include/babeltrace/graph/notification-internal.h
+++ b/include/babeltrace/graph/notification-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H
 
 /*
  * BabelTrace - Plug-in Notification internal
@@ -88,4 +88,4 @@ const char *bt_notification_type_string(enum bt_notification_type type)
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-iterator-internal.h b/include/babeltrace/graph/notification-iterator-internal.h
index 47b19159..55aa4e62 100644
--- a/include/babeltrace/graph/notification-iterator-internal.h
+++ b/include/babeltrace/graph/notification-iterator-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_ITERATOR_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_ITERATOR_INTERNAL_H
 
 /*
  * BabelTrace - Notification Iterator Internal
@@ -221,4 +221,4 @@ const char *bt_private_connection_notification_iterator_state_string(
 	}
 };
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_ITERATOR_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-packet-internal.h b/include/babeltrace/graph/notification-packet-internal.h
index 4fc40166..1c591751 100644
--- a/include/babeltrace/graph/notification-packet-internal.h
+++ b/include/babeltrace/graph/notification-packet-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_PACKET_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_PACKET_INTERNAL_H
 
 /*
  * BabelTrace - Packet-related Notifications
@@ -66,4 +66,4 @@ struct bt_packet *bt_notification_packet_end_borrow_packet(
 	return notif_packet_end->packet;
 }
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_PACKET_INTERNAL_H */
diff --git a/include/babeltrace/graph/notification-stream-internal.h b/include/babeltrace/graph/notification-stream-internal.h
index 5c0f7226..a9067947 100644
--- a/include/babeltrace/graph/notification-stream-internal.h
+++ b/include/babeltrace/graph/notification-stream-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
 
 /*
  * BabelTrace - Stream-related Notifications
@@ -66,4 +66,4 @@ struct bt_stream *bt_notification_stream_end_borrow_stream(
 	return notif_stream_end->stream;
 }
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H */
diff --git a/include/babeltrace/graph/port-internal.h b/include/babeltrace/graph/port-internal.h
index f4d4c036..8f2fb4b7 100644
--- a/include/babeltrace/graph/port-internal.h
+++ b/include/babeltrace/graph/port-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PORT_INTERNAL_H
-#define BABELTRACE_COMPONENT_PORT_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_PORT_INTERNAL_H
+#define BABELTRACE_GRAPH_PORT_INTERNAL_H
 
 /*
  * BabelTrace - Babeltrace Component Port
@@ -74,4 +74,4 @@ const char *bt_port_type_string(enum bt_port_type port_type)
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_PORT_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_PORT_INTERNAL_H */
diff --git a/include/babeltrace/graph/private-component-filter.h b/include/babeltrace/graph/private-component-filter.h
index b9cee60b..4431bffd 100644
--- a/include/babeltrace/graph/private-component-filter.h
+++ b/include/babeltrace/graph/private-component-filter.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SINK_H
-#define BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SINK_H
+#ifndef BABELTRACE_GRAPH_PRIVATE_COMPONENT_FILTER_H
+#define BABELTRACE_GRAPH_PRIVATE_COMPONENT_FILTER_H
 
 /*
  * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
@@ -70,4 +70,4 @@ bt_private_component_filter_add_input_private_port(
 }
 #endif
 
-#endif /* BABELTRACE_COMPONENT_PRIVATE_COMPONENT_SINK_H */
+#endif /* BABELTRACE_GRAPH_PRIVATE_COMPONENT_FILTER_H */
-- 
2.34.1