From 2e33ac5abec88a4be03907091474324dfcc42e23 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 8 Feb 2016 19:32:00 -0500 Subject: [PATCH] ir: rename event-fields/event-types -> fields/field-types MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- bindings/python/python-complements.c | 6 +++--- formats/ctf/ir/Makefile.am | 4 ++-- formats/ctf/ir/event.c | 7 ++----- formats/ctf/ir/field-path.c | 2 +- formats/ctf/ir/{event-types.c => field-types.c} | 5 ++--- formats/ctf/ir/{event-fields.c => fields.c} | 7 +++---- formats/ctf/ir/resolve.c | 2 +- formats/ctf/ir/stream-class.c | 4 ++-- formats/ctf/ir/stream.c | 4 ++-- formats/ctf/ir/trace.c | 2 +- formats/ctf/ir/validation.c | 2 +- formats/ctf/writer/writer.c | 4 ++-- include/Makefile.am | 8 ++++---- include/babeltrace/ctf-ir/field-path.h | 2 +- .../{event-types-internal.h => field-types-internal.h} | 8 ++++---- .../babeltrace/ctf-ir/{event-types.h => field-types.h} | 8 ++++---- .../ctf-ir/{event-fields-internal.h => fields-internal.h} | 8 ++++---- include/babeltrace/ctf-ir/{event-fields.h => fields.h} | 8 ++++---- include/babeltrace/ctf-ir/resolve-internal.h | 4 ++-- include/babeltrace/ctf-ir/trace-internal.h | 4 ++-- include/babeltrace/ctf-ir/trace.h | 2 +- include/babeltrace/ctf-ir/validation-internal.h | 2 +- include/babeltrace/ctf-writer/event-fields.h | 2 +- include/babeltrace/ctf-writer/event-types.h | 2 +- include/babeltrace/ctf-writer/writer.h | 2 +- include/babeltrace/ctf/events-internal.h | 2 +- include/babeltrace/ctf/events.h | 4 ++-- tests/lib/test_bt_ctf_field_type_validation.c | 2 +- 28 files changed, 56 insertions(+), 61 deletions(-) rename formats/ctf/ir/{event-types.c => field-types.c} (99%) rename formats/ctf/ir/{event-fields.c => fields.c} (99%) rename include/babeltrace/ctf-ir/{event-types-internal.h => field-types-internal.h} (97%) rename include/babeltrace/ctf-ir/{event-types.h => field-types.h} (99%) rename include/babeltrace/ctf-ir/{event-fields-internal.h => fields-internal.h} (93%) rename include/babeltrace/ctf-ir/{event-fields.h => fields.h} (98%) diff --git a/bindings/python/python-complements.c b/bindings/python/python-complements.c index b916b58c..08b7912f 100644 --- a/bindings/python/python-complements.c +++ b/bindings/python/python-complements.c @@ -26,9 +26,9 @@ */ #include "python-complements.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/formats/ctf/ir/Makefile.am b/formats/ctf/ir/Makefile.am index e9dc96ef..d483ff89 100644 --- a/formats/ctf/ir/Makefile.am +++ b/formats/ctf/ir/Makefile.am @@ -6,8 +6,8 @@ libctf_ir_la_SOURCES = \ attributes.c \ clock.c \ event.c \ - event-fields.c \ - event-types.c \ + fields.c \ + field-types.c \ field-path.c \ stream.c \ stream-class.c \ diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c index f9779e24..8ddf8034 100644 --- a/formats/ctf/ir/event.c +++ b/formats/ctf/ir/event.c @@ -26,11 +26,8 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include #include #include #include diff --git a/formats/ctf/ir/field-path.c b/formats/ctf/ir/field-path.c index 44de8cd4..6c0b248a 100644 --- a/formats/ctf/ir/field-path.c +++ b/formats/ctf/ir/field-path.c @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include +#include #include #include #include diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/field-types.c similarity index 99% rename from formats/ctf/ir/event-types.c rename to formats/ctf/ir/field-types.c index eab0ef43..1613dd19 100644 --- a/formats/ctf/ir/event-types.c +++ b/formats/ctf/ir/field-types.c @@ -1,5 +1,5 @@ /* - * event-types.c + * field-types.c * * Babeltrace CTF IR - Event Types * @@ -26,8 +26,7 @@ * SOFTWARE. */ -#include -#include +#include #include #include #include diff --git a/formats/ctf/ir/event-fields.c b/formats/ctf/ir/fields.c similarity index 99% rename from formats/ctf/ir/event-fields.c rename to formats/ctf/ir/fields.c index 91e7e9c4..93e9486c 100644 --- a/formats/ctf/ir/event-fields.c +++ b/formats/ctf/ir/fields.c @@ -1,5 +1,5 @@ /* - * event-fields.c + * fields.c * * Babeltrace CTF IR - Event Fields * @@ -26,9 +26,8 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include #include #include #include diff --git a/formats/ctf/ir/resolve.c b/formats/ctf/ir/resolve.c index c9a56b79..fba3f03e 100644 --- a/formats/ctf/ir/resolve.c +++ b/formats/ctf/ir/resolve.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c index ead548a7..aceb5b77 100644 --- a/formats/ctf/ir/stream-class.c +++ b/formats/ctf/ir/stream-class.c @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c index 1ee583f0..97f17946 100644 --- a/formats/ctf/ir/stream.c +++ b/formats/ctf/ir/stream.c @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c index 75a47952..de8055b8 100644 --- a/formats/ctf/ir/trace.c +++ b/formats/ctf/ir/trace.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/formats/ctf/ir/validation.c b/formats/ctf/ir/validation.c index 6deaa7a0..789a6f57 100644 --- a/formats/ctf/ir/validation.c +++ b/formats/ctf/ir/validation.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/formats/ctf/writer/writer.c b/formats/ctf/writer/writer.c index 52c153d1..babe033b 100644 --- a/formats/ctf/writer/writer.c +++ b/formats/ctf/writer/writer.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index fbb7fce6..751128a9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -25,8 +25,8 @@ babeltracectfwriterinclude_HEADERS = \ babeltracectfirinclude_HEADERS = \ babeltrace/ctf-ir/clock.h \ - babeltrace/ctf-ir/event-fields.h \ - babeltrace/ctf-ir/event-types.h \ + babeltrace/ctf-ir/fields.h \ + babeltrace/ctf-ir/field-types.h \ babeltrace/ctf-ir/event.h \ babeltrace/ctf-ir/field-path.h \ babeltrace/ctf-ir/stream.h \ @@ -57,8 +57,8 @@ noinst_HEADERS = \ babeltrace/ctf/ctf-index.h \ babeltrace/ctf-writer/writer-internal.h \ babeltrace/ctf-ir/attributes-internal.h \ - babeltrace/ctf-ir/event-types-internal.h \ - babeltrace/ctf-ir/event-fields-internal.h \ + babeltrace/ctf-ir/field-types-internal.h \ + babeltrace/ctf-ir/fields-internal.h \ babeltrace/ctf-ir/event-internal.h \ babeltrace/ctf-ir/field-path-internal.h \ babeltrace/ctf-ir/clock-internal.h \ diff --git a/include/babeltrace/ctf-ir/field-path.h b/include/babeltrace/ctf-ir/field-path.h index ffcaae00..40acfc8b 100644 --- a/include/babeltrace/ctf-ir/field-path.h +++ b/include/babeltrace/ctf-ir/field-path.h @@ -28,7 +28,7 @@ * http://www.efficios.com/ctf */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-ir/event-types-internal.h b/include/babeltrace/ctf-ir/field-types-internal.h similarity index 97% rename from include/babeltrace/ctf-ir/event-types-internal.h rename to include/babeltrace/ctf-ir/field-types-internal.h index 8eaaeb88..d3a4b0c1 100644 --- a/include/babeltrace/ctf-ir/event-types-internal.h +++ b/include/babeltrace/ctf-ir/field-types-internal.h @@ -1,8 +1,8 @@ -#ifndef BABELTRACE_CTF_IR_EVENT_TYPES_INTERNAL_H -#define BABELTRACE_CTF_IR_EVENT_TYPES_INTERNAL_H +#ifndef BABELTRACE_CTF_IR_FIELD_TYPES_INTERNAL_H +#define BABELTRACE_CTF_IR_FIELD_TYPES_INTERNAL_H /* - * BabelTrace - CTF IR: Event types internal + * BabelTrace - CTF IR: Event field types internal * * Copyright 2013, 2014 Jérémie Galarneau * @@ -248,4 +248,4 @@ BT_HIDDEN int bt_ctf_field_type_get_field_index(struct bt_ctf_field_type *type, const char *name); -#endif /* BABELTRACE_CTF_IR_EVENT_TYPES_INTERNAL_H */ +#endif /* BABELTRACE_CTF_IR_FIELD_TYPES_INTERNAL_H */ diff --git a/include/babeltrace/ctf-ir/event-types.h b/include/babeltrace/ctf-ir/field-types.h similarity index 99% rename from include/babeltrace/ctf-ir/event-types.h rename to include/babeltrace/ctf-ir/field-types.h index be6b7ea2..ce9ca72f 100644 --- a/include/babeltrace/ctf-ir/event-types.h +++ b/include/babeltrace/ctf-ir/field-types.h @@ -1,8 +1,8 @@ -#ifndef BABELTRACE_CTF_IR_EVENT_TYPES_H -#define BABELTRACE_CTF_IR_EVENT_TYPES_H +#ifndef BABELTRACE_CTF_IR_FIELD_TYPES_H +#define BABELTRACE_CTF_IR_FIELD_TYPES_H /* - * BabelTrace - CTF IR: Event Types + * BabelTrace - CTF IR: Event field types * * Copyright 2013, 2014 Jérémie Galarneau * @@ -964,4 +964,4 @@ extern void bt_ctf_field_type_put(struct bt_ctf_field_type *type); } #endif -#endif /* BABELTRACE_CTF_IR_EVENT_TYPES_H */ +#endif /* BABELTRACE_CTF_IR_FIELD_TYPES_H */ diff --git a/include/babeltrace/ctf-ir/event-fields-internal.h b/include/babeltrace/ctf-ir/fields-internal.h similarity index 93% rename from include/babeltrace/ctf-ir/event-fields-internal.h rename to include/babeltrace/ctf-ir/fields-internal.h index 4dea4a79..bd95bd2e 100644 --- a/include/babeltrace/ctf-ir/event-fields-internal.h +++ b/include/babeltrace/ctf-ir/fields-internal.h @@ -1,8 +1,8 @@ -#ifndef BABELTRACE_CTF_WRITER_EVENT_FIELDS_INTERNAL_H -#define BABELTRACE_CTF_WRITER_EVENT_FIELDS_INTERNAL_H +#ifndef BABELTRACE_CTF_IR_FIELDS_INTERNAL_H +#define BABELTRACE_CTF_IR_FIELDS_INTERNAL_H /* - * BabelTrace - CTF Writer: Event Fields internal + * Babeltrace - CTF IR: Event Fields internal * * Copyright 2013, 2014 Jérémie Galarneau * @@ -102,4 +102,4 @@ BT_HIDDEN int bt_ctf_field_serialize(struct bt_ctf_field *field, struct ctf_stream_pos *pos); -#endif /* BABELTRACE_CTF_WRITER_EVENT_FIELDS_INTERNAL_H */ +#endif /* BABELTRACE_CTF_IR_FIELDS_INTERNAL_H */ diff --git a/include/babeltrace/ctf-ir/event-fields.h b/include/babeltrace/ctf-ir/fields.h similarity index 98% rename from include/babeltrace/ctf-ir/event-fields.h rename to include/babeltrace/ctf-ir/fields.h index 28d6fa5a..1b1ac8c2 100644 --- a/include/babeltrace/ctf-ir/event-fields.h +++ b/include/babeltrace/ctf-ir/fields.h @@ -1,8 +1,8 @@ -#ifndef BABELTRACE_CTF_IR_EVENT_FIELDS_H -#define BABELTRACE_CTF_IR_EVENT_FIELDS_H +#ifndef BABELTRACE_CTF_IR_FIELDS_H +#define BABELTRACE_CTF_IR_FIELDS_H /* - * BabelTrace - CTF IR: Event Fields + * Babeltrace - CTF IR: Event Fields * * Copyright 2013, 2014 Jérémie Galarneau * @@ -483,4 +483,4 @@ extern void bt_ctf_field_put(struct bt_ctf_field *field); } #endif -#endif /* BABELTRACE_CTF_IR_EVENT_FIELDS_H */ +#endif /* BABELTRACE_CTF_IR_FIELDS_H */ diff --git a/include/babeltrace/ctf-ir/resolve-internal.h b/include/babeltrace/ctf-ir/resolve-internal.h index bd35f628..5479d44f 100644 --- a/include/babeltrace/ctf-ir/resolve-internal.h +++ b/include/babeltrace/ctf-ir/resolve-internal.h @@ -29,8 +29,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include #include #include diff --git a/include/babeltrace/ctf-ir/trace-internal.h b/include/babeltrace/ctf-ir/trace-internal.h index e92eb7c1..eb8a2563 100644 --- a/include/babeltrace/ctf-ir/trace-internal.h +++ b/include/babeltrace/ctf-ir/trace-internal.h @@ -28,8 +28,8 @@ */ #include -#include -#include +#include +#include #include #include #include diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace/ctf-ir/trace.h index 29b60980..407982b3 100644 --- a/include/babeltrace/ctf-ir/trace.h +++ b/include/babeltrace/ctf-ir/trace.h @@ -30,7 +30,7 @@ * http://www.efficios.com/ctf */ -#include +#include #include #include diff --git a/include/babeltrace/ctf-ir/validation-internal.h b/include/babeltrace/ctf-ir/validation-internal.h index 065b32ea..e5636377 100644 --- a/include/babeltrace/ctf-ir/validation-internal.h +++ b/include/babeltrace/ctf-ir/validation-internal.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include +#include #include #include #include diff --git a/include/babeltrace/ctf-writer/event-fields.h b/include/babeltrace/ctf-writer/event-fields.h index b5d8ccbc..3ab3e39f 100644 --- a/include/babeltrace/ctf-writer/event-fields.h +++ b/include/babeltrace/ctf-writer/event-fields.h @@ -27,4 +27,4 @@ * http://www.efficios.com/ctf */ -#include +#include diff --git a/include/babeltrace/ctf-writer/event-types.h b/include/babeltrace/ctf-writer/event-types.h index b1f4b21a..ac00f7e3 100644 --- a/include/babeltrace/ctf-writer/event-types.h +++ b/include/babeltrace/ctf-writer/event-types.h @@ -27,4 +27,4 @@ * http://www.efficios.com/ctf */ -#include +#include diff --git a/include/babeltrace/ctf-writer/writer.h b/include/babeltrace/ctf-writer/writer.h index 1c94bcca..940736fe 100644 --- a/include/babeltrace/ctf-writer/writer.h +++ b/include/babeltrace/ctf-writer/writer.h @@ -30,7 +30,7 @@ * http://www.efficios.com/ctf */ -#include +#include #include #ifdef __cplusplus diff --git a/include/babeltrace/ctf/events-internal.h b/include/babeltrace/ctf/events-internal.h index ba64bc09..d227b4d4 100644 --- a/include/babeltrace/ctf/events-internal.h +++ b/include/babeltrace/ctf/events-internal.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include struct ctf_stream_definition; diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h index 15ebe56f..134db8c0 100644 --- a/include/babeltrace/ctf/events.h +++ b/include/babeltrace/ctf/events.h @@ -34,12 +34,12 @@ #include #include #include -#include +#include /* * This header must exist in Babeltrace 2 because it contained * enumerations that were used in CTF writer's API. Those enumerations - * are now located in ctf-ir/event-types.h. + * are now located in ctf-ir/field-types.h. */ #endif /* _BABELTRACE_CTF_EVENTS_H */ diff --git a/tests/lib/test_bt_ctf_field_type_validation.c b/tests/lib/test_bt_ctf_field_type_validation.c index 6338a7b3..c626d4ba 100644 --- a/tests/lib/test_bt_ctf_field_type_validation.c +++ b/tests/lib/test_bt_ctf_field_type_validation.c @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include #include #include #include -- 2.34.1