From c6bd8523ba4a37b61a1591c03e23614112b155ba Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 7 Dec 2018 16:23:29 -0500 Subject: [PATCH] lib: rename plural file names to singular For example, the object is `struct bt_value` so name the header file `value.h`. Signed-off-by: Philippe Proulx --- cli/babeltrace-cfg-cli-args-connect.h | 2 +- cli/babeltrace-cfg-cli-args.h | 2 +- cli/babeltrace-cfg.h | 2 +- include/Makefile.am | 18 +++++++++--------- include/babeltrace/babeltrace.h | 12 ++++++------ include/babeltrace/common-internal.h | 4 ++-- .../ctf-writer/event-class-internal.h | 2 +- include/babeltrace/ctf-writer/event-internal.h | 2 +- include/babeltrace/ctf-writer/trace-internal.h | 2 +- .../ctf-writer/validation-internal.h | 2 +- .../babeltrace/trace-ir/attributes-internal.h | 2 +- .../babeltrace/trace-ir/event-class-internal.h | 6 +++--- include/babeltrace/trace-ir/event-internal.h | 6 +++--- ...eld-classes-const.h => field-class-const.h} | 0 ...asses-internal.h => field-class-internal.h} | 2 +- .../{field-classes.h => field-class.h} | 2 +- .../trace-ir/{fields-const.h => field-const.h} | 2 +- .../{fields-internal.h => field-internal.h} | 2 +- .../trace-ir/field-wrapper-internal.h | 2 +- .../babeltrace/trace-ir/{fields.h => field.h} | 0 include/babeltrace/trace-ir/packet-internal.h | 2 +- .../trace-ir/resolve-field-path-internal.h | 2 +- .../trace-ir/stream-class-internal.h | 2 +- .../babeltrace/trace-ir/trace-class-internal.h | 6 +++--- include/babeltrace/trace-ir/trace-internal.h | 6 +++--- include/babeltrace/trace-ir/utils-internal.h | 2 +- .../{values-const.h => value-const.h} | 0 .../{values-internal.h => value-internal.h} | 4 ++-- include/babeltrace/{values.h => value.h} | 2 +- lib/Makefile.am | 2 +- lib/graph/component-filter.c | 2 +- lib/graph/component-sink.c | 2 +- lib/graph/component.c | 4 ++-- lib/graph/graph.c | 6 +++--- lib/graph/iterator.c | 2 +- lib/graph/query-executor.c | 4 ++-- lib/lib-logging.c | 8 ++++---- lib/trace-ir/Makefile.am | 4 ++-- lib/trace-ir/attributes.c | 6 +++--- lib/trace-ir/event-class.c | 8 ++++---- lib/trace-ir/event-header-field.c | 2 +- lib/trace-ir/event.c | 4 ++-- .../{field-classes.c => field-class.c} | 12 ++++++------ lib/trace-ir/field-path.c | 4 ++-- lib/trace-ir/field-wrapper.c | 2 +- lib/trace-ir/{fields.c => field.c} | 8 ++++---- lib/trace-ir/packet-context-field.c | 2 +- lib/trace-ir/packet-header-field.c | 2 +- lib/trace-ir/packet.c | 2 +- lib/trace-ir/resolve-field-path.c | 2 +- lib/trace-ir/stream-class.c | 4 ++-- lib/trace-ir/trace-class.c | 8 ++++---- lib/trace-ir/trace.c | 8 ++++---- lib/trace-ir/utils.c | 2 +- lib/{values.c => value.c} | 6 +++--- plugins/libctfcopytrace/clock-fields.c | 2 +- plugins/libctfcopytrace/ctfcopytrace.c | 2 +- plugins/text/dmesg/dmesg.c | 2 +- plugins/utils/muxer/muxer.c | 2 +- plugins/utils/trimmer/iterator.c | 4 ++-- plugins/utils/trimmer/trimmer.c | 4 ++-- tests/lib/test_ctf_writer.c | 2 +- 62 files changed, 116 insertions(+), 116 deletions(-) rename include/babeltrace/trace-ir/{field-classes-const.h => field-class-const.h} (100%) rename include/babeltrace/trace-ir/{field-classes-internal.h => field-class-internal.h} (99%) rename include/babeltrace/trace-ir/{field-classes.h => field-class.h} (98%) rename include/babeltrace/trace-ir/{fields-const.h => field-const.h} (98%) rename include/babeltrace/trace-ir/{fields-internal.h => field-internal.h} (99%) rename include/babeltrace/trace-ir/{fields.h => field.h} (100%) rename include/babeltrace/{values-const.h => value-const.h} (100%) rename include/babeltrace/{values-internal.h => value-internal.h} (95%) rename include/babeltrace/{values.h => value.h} (99%) rename lib/trace-ir/{field-classes.c => field-class.c} (99%) rename lib/trace-ir/{fields.c => field.c} (99%) rename lib/{values.c => value.c} (99%) diff --git a/cli/babeltrace-cfg-cli-args-connect.h b/cli/babeltrace-cfg-cli-args-connect.h index 5c5f1ff5..7814bcd5 100644 --- a/cli/babeltrace-cfg-cli-args-connect.h +++ b/cli/babeltrace-cfg-cli-args-connect.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "babeltrace-cfg.h" diff --git a/cli/babeltrace-cfg-cli-args.h b/cli/babeltrace-cfg-cli-args.h index e6afb375..fd222724 100644 --- a/cli/babeltrace-cfg-cli-args.h +++ b/cli/babeltrace-cfg-cli-args.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/cli/babeltrace-cfg.h b/cli/babeltrace-cfg.h index 9bcc1858..e7e98372 100644 --- a/cli/babeltrace-cfg.h +++ b/cli/babeltrace-cfg.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index da92f90b..fa75c7c3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -76,8 +76,8 @@ babeltraceinclude_HEADERS = \ babeltrace/object.h \ babeltrace/property.h \ babeltrace/types.h \ - babeltrace/values-const.h \ - babeltrace/values.h \ + babeltrace/value-const.h \ + babeltrace/value.h \ babeltrace/version.h # Legacy API (for CTF writer) @@ -126,11 +126,11 @@ babeltracetraceirinclude_HEADERS = \ babeltrace/trace-ir/event-const.h \ babeltrace/trace-ir/event-header-field.h \ babeltrace/trace-ir/event.h \ - babeltrace/trace-ir/field-classes-const.h \ - babeltrace/trace-ir/field-classes.h \ + babeltrace/trace-ir/field-class-const.h \ + babeltrace/trace-ir/field-class.h \ babeltrace/trace-ir/field-path-const.h \ - babeltrace/trace-ir/fields-const.h \ - babeltrace/trace-ir/fields.h \ + babeltrace/trace-ir/field-const.h \ + babeltrace/trace-ir/field.h \ babeltrace/trace-ir/packet-const.h \ babeltrace/trace-ir/packet-context-field.h \ babeltrace/trace-ir/packet-header-field.h \ @@ -219,7 +219,7 @@ noinst_HEADERS = \ babeltrace/plugin/plugin-so-internal.h \ babeltrace/plugin/python-plugin-provider-internal.h \ babeltrace/assert-internal.h \ - babeltrace/values-internal.h \ + babeltrace/value-internal.h \ babeltrace/ctf-writer/attributes-internal.h \ babeltrace/ctf-writer/clock-class-internal.h \ babeltrace/ctf-writer/clock-internal.h \ @@ -249,9 +249,9 @@ noinst_HEADERS = \ babeltrace/trace-ir/clock-value-set-internal.h \ babeltrace/trace-ir/event-class-internal.h \ babeltrace/trace-ir/event-internal.h \ - babeltrace/trace-ir/field-classes-internal.h \ + babeltrace/trace-ir/field-class-internal.h \ babeltrace/trace-ir/field-path-internal.h \ - babeltrace/trace-ir/fields-internal.h \ + babeltrace/trace-ir/field-internal.h \ babeltrace/trace-ir/field-wrapper-internal.h \ babeltrace/trace-ir/packet-internal.h \ babeltrace/trace-ir/resolve-field-path-internal.h \ diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h index 23e86821..a1fb21d9 100644 --- a/include/babeltrace/babeltrace.h +++ b/include/babeltrace/babeltrace.h @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include /* Legacy API (for CTF writer) */ @@ -72,11 +72,11 @@ #include #include #include -#include -#include +#include +#include +#include #include -#include -#include +#include #include #include #include diff --git a/include/babeltrace/common-internal.h b/include/babeltrace/common-internal.h index d27f8967..eebe5926 100644 --- a/include/babeltrace/common-internal.h +++ b/include/babeltrace/common-internal.h @@ -27,10 +27,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/ctf-writer/event-class-internal.h b/include/babeltrace/ctf-writer/event-class-internal.h index 3a7b8617..1a12ac11 100644 --- a/include/babeltrace/ctf-writer/event-class-internal.h +++ b/include/babeltrace/ctf-writer/event-class-internal.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include struct bt_ctf_event_class_common { diff --git a/include/babeltrace/ctf-writer/event-internal.h b/include/babeltrace/ctf-writer/event-internal.h index d6297570..deecbf31 100644 --- a/include/babeltrace/ctf-writer/event-internal.h +++ b/include/babeltrace/ctf-writer/event-internal.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include struct bt_ctf_stream_class; struct bt_ctf_stream_pos; diff --git a/include/babeltrace/ctf-writer/trace-internal.h b/include/babeltrace/ctf-writer/trace-internal.h index b1104256..fbfd2e03 100644 --- a/include/babeltrace/ctf-writer/trace-internal.h +++ b/include/babeltrace/ctf-writer/trace-internal.h @@ -39,8 +39,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/include/babeltrace/ctf-writer/validation-internal.h b/include/babeltrace/ctf-writer/validation-internal.h index 235a2623..996126bd 100644 --- a/include/babeltrace/ctf-writer/validation-internal.h +++ b/include/babeltrace/ctf-writer/validation-internal.h @@ -24,7 +24,7 @@ */ #include -#include +#include struct bt_ctf_trace_common; struct bt_ctf_stream_class_common; diff --git a/include/babeltrace/trace-ir/attributes-internal.h b/include/babeltrace/trace-ir/attributes-internal.h index a0d7d358..b679e122 100644 --- a/include/babeltrace/trace-ir/attributes-internal.h +++ b/include/babeltrace/trace-ir/attributes-internal.h @@ -30,7 +30,7 @@ extern "C" { #include #include -#include +#include BT_HIDDEN struct bt_value *bt_attributes_create(void); diff --git a/include/babeltrace/trace-ir/event-class-internal.h b/include/babeltrace/trace-ir/event-class-internal.h index 28f8d785..2bbb4243 100644 --- a/include/babeltrace/trace-ir/event-class-internal.h +++ b/include/babeltrace/trace-ir/event-class-internal.h @@ -26,10 +26,10 @@ */ #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/event-internal.h b/include/babeltrace/trace-ir/event-internal.h index eedceaea..12928dd2 100644 --- a/include/babeltrace/trace-ir/event-internal.h +++ b/include/babeltrace/trace-ir/event-internal.h @@ -32,15 +32,15 @@ #include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/field-classes-const.h b/include/babeltrace/trace-ir/field-class-const.h similarity index 100% rename from include/babeltrace/trace-ir/field-classes-const.h rename to include/babeltrace/trace-ir/field-class-const.h diff --git a/include/babeltrace/trace-ir/field-classes-internal.h b/include/babeltrace/trace-ir/field-class-internal.h similarity index 99% rename from include/babeltrace/trace-ir/field-classes-internal.h rename to include/babeltrace/trace-ir/field-class-internal.h index 94056c3e..ea1e3a8b 100644 --- a/include/babeltrace/trace-ir/field-classes-internal.h +++ b/include/babeltrace/trace-ir/field-class-internal.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/field-classes.h b/include/babeltrace/trace-ir/field-class.h similarity index 98% rename from include/babeltrace/trace-ir/field-classes.h rename to include/babeltrace/trace-ir/field-class.h index 91806629..79a1a159 100644 --- a/include/babeltrace/trace-ir/field-classes.h +++ b/include/babeltrace/trace-ir/field-class.h @@ -32,7 +32,7 @@ #include /* For enum bt_field_class_integer_preferred_display_base */ -#include +#include #include #include diff --git a/include/babeltrace/trace-ir/fields-const.h b/include/babeltrace/trace-ir/field-const.h similarity index 98% rename from include/babeltrace/trace-ir/fields-const.h rename to include/babeltrace/trace-ir/field-const.h index 53188acb..d868c4e7 100644 --- a/include/babeltrace/trace-ir/fields-const.h +++ b/include/babeltrace/trace-ir/field-const.h @@ -31,7 +31,7 @@ #include /* For enum bt_field_class_type */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/fields-internal.h b/include/babeltrace/trace-ir/field-internal.h similarity index 99% rename from include/babeltrace/trace-ir/fields-internal.h rename to include/babeltrace/trace-ir/field-internal.h index 957293b7..492aeccd 100644 --- a/include/babeltrace/trace-ir/fields-internal.h +++ b/include/babeltrace/trace-ir/field-internal.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/field-wrapper-internal.h b/include/babeltrace/trace-ir/field-wrapper-internal.h index 732132f6..d1a7a9d8 100644 --- a/include/babeltrace/trace-ir/field-wrapper-internal.h +++ b/include/babeltrace/trace-ir/field-wrapper-internal.h @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #include #include diff --git a/include/babeltrace/trace-ir/fields.h b/include/babeltrace/trace-ir/field.h similarity index 100% rename from include/babeltrace/trace-ir/fields.h rename to include/babeltrace/trace-ir/field.h diff --git a/include/babeltrace/trace-ir/packet-internal.h b/include/babeltrace/trace-ir/packet-internal.h index 3623c6bb..9f963087 100644 --- a/include/babeltrace/trace-ir/packet-internal.h +++ b/include/babeltrace/trace-ir/packet-internal.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/resolve-field-path-internal.h b/include/babeltrace/trace-ir/resolve-field-path-internal.h index f7abb4e2..f6957811 100644 --- a/include/babeltrace/trace-ir/resolve-field-path-internal.h +++ b/include/babeltrace/trace-ir/resolve-field-path-internal.h @@ -27,7 +27,7 @@ */ #include -#include +#include #include #include diff --git a/include/babeltrace/trace-ir/stream-class-internal.h b/include/babeltrace/trace-ir/stream-class-internal.h index 8774db7a..9d5f0429 100644 --- a/include/babeltrace/trace-ir/stream-class-internal.h +++ b/include/babeltrace/trace-ir/stream-class-internal.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/trace-class-internal.h b/include/babeltrace/trace-ir/trace-class-internal.h index 46bf525f..b5e8fb3f 100644 --- a/include/babeltrace/trace-ir/trace-class-internal.h +++ b/include/babeltrace/trace-ir/trace-class-internal.h @@ -28,14 +28,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/trace-internal.h b/include/babeltrace/trace-ir/trace-internal.h index 3b6eb1c7..4154be6e 100644 --- a/include/babeltrace/trace-ir/trace-internal.h +++ b/include/babeltrace/trace-ir/trace-internal.h @@ -29,14 +29,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/utils-internal.h b/include/babeltrace/trace-ir/utils-internal.h index 36cb2908..b828f399 100644 --- a/include/babeltrace/trace-ir/utils-internal.h +++ b/include/babeltrace/trace-ir/utils-internal.h @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include diff --git a/include/babeltrace/values-const.h b/include/babeltrace/value-const.h similarity index 100% rename from include/babeltrace/values-const.h rename to include/babeltrace/value-const.h diff --git a/include/babeltrace/values-internal.h b/include/babeltrace/value-internal.h similarity index 95% rename from include/babeltrace/values-internal.h rename to include/babeltrace/value-internal.h index d505f0e4..81b2845f 100644 --- a/include/babeltrace/values-internal.h +++ b/include/babeltrace/value-internal.h @@ -24,8 +24,8 @@ * SOFTWARE. */ -#include -#include +#include +#include BT_HIDDEN enum bt_value_status _bt_value_freeze(const struct bt_value *object); diff --git a/include/babeltrace/values.h b/include/babeltrace/value.h similarity index 99% rename from include/babeltrace/values.h rename to include/babeltrace/value.h index 85a838e8..b0a6c077 100644 --- a/include/babeltrace/values.h +++ b/include/babeltrace/value.h @@ -31,7 +31,7 @@ #include /* For enum bt_value_status, enum bt_value_type */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/lib/Makefile.am b/lib/Makefile.am index ab1aa771..01187650 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la libbabeltrace_la_SOURCES = \ babeltrace.c \ - values.c \ + value.c \ object.c \ lib-logging.c \ logging.c \ diff --git a/lib/graph/component-filter.c b/lib/graph/component-filter.c index 869c3d77..4c9917df 100644 --- a/lib/graph/component-filter.c +++ b/lib/graph/component-filter.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/graph/component-sink.c b/lib/graph/component-sink.c index 033c8e6e..42814822 100644 --- a/lib/graph/component-sink.c +++ b/lib/graph/component-sink.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/graph/component.c b/lib/graph/component.c index 2d3460a0..81c573b1 100644 --- a/lib/graph/component.c +++ b/lib/graph/component.c @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/graph/graph.c b/lib/graph/graph.c index db88e333..4f888b7a 100644 --- a/lib/graph/graph.c +++ b/lib/graph/graph.c @@ -39,9 +39,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c index 54ce07dc..64d8cfa3 100644 --- a/lib/graph/iterator.c +++ b/lib/graph/iterator.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/graph/query-executor.c b/lib/graph/query-executor.c index a24b093d..d7216529 100644 --- a/lib/graph/query-executor.c +++ b/lib/graph/query-executor.c @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/lib-logging.c b/lib/lib-logging.c index d58996b0..46ac3a54 100644 --- a/lib/lib-logging.c +++ b/lib/lib-logging.c @@ -32,11 +32,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/trace-ir/Makefile.am b/lib/trace-ir/Makefile.am index 5ddcb37a..f51103b1 100644 --- a/lib/trace-ir/Makefile.am +++ b/lib/trace-ir/Makefile.am @@ -8,8 +8,8 @@ libtrace_ir_la_SOURCES = \ event-class.c \ event-header-field.c \ field-wrapper.c \ - fields.c \ - field-classes.c \ + field.c \ + field-class.c \ field-path.c \ packet.c \ packet-context-field.c \ diff --git a/lib/trace-ir/attributes.c b/lib/trace-ir/attributes.c index c158c7dc..af8a4936 100644 --- a/lib/trace-ir/attributes.c +++ b/lib/trace-ir/attributes.c @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/event-class.c b/lib/trace-ir/event-class.c index 76a35e8d..cf4cbf88 100644 --- a/lib/trace-ir/event-class.c +++ b/lib/trace-ir/event-class.c @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/trace-ir/event-header-field.c b/lib/trace-ir/event-header-field.c index 22d8a692..da7e8c94 100644 --- a/lib/trace-ir/event-header-field.c +++ b/lib/trace-ir/event-header-field.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/trace-ir/event.c b/lib/trace-ir/event.c index 47ff78bf..2ac29609 100644 --- a/lib/trace-ir/event.c +++ b/lib/trace-ir/event.c @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/trace-ir/field-classes.c b/lib/trace-ir/field-class.c similarity index 99% rename from lib/trace-ir/field-classes.c rename to lib/trace-ir/field-class.c index 31f67b1d..6515804f 100644 --- a/lib/trace-ir/field-classes.c +++ b/lib/trace-ir/field-class.c @@ -26,13 +26,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/field-path.c b/lib/trace-ir/field-path.c index 1074e5ca..a767182e 100644 --- a/lib/trace-ir/field-path.c +++ b/lib/trace-ir/field-path.c @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/trace-ir/field-wrapper.c b/lib/trace-ir/field-wrapper.c index efff4a1f..6d02b757 100644 --- a/lib/trace-ir/field-wrapper.c +++ b/lib/trace-ir/field-wrapper.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/trace-ir/fields.c b/lib/trace-ir/field.c similarity index 99% rename from lib/trace-ir/fields.c rename to lib/trace-ir/field.c index 275c02b9..e57d867e 100644 --- a/lib/trace-ir/fields.c +++ b/lib/trace-ir/field.c @@ -26,10 +26,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/packet-context-field.c b/lib/trace-ir/packet-context-field.c index 1b2e7ef8..2df09f08 100644 --- a/lib/trace-ir/packet-context-field.c +++ b/lib/trace-ir/packet-context-field.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/trace-ir/packet-header-field.c b/lib/trace-ir/packet-header-field.c index 3b7d89f5..8f72a42a 100644 --- a/lib/trace-ir/packet-header-field.c +++ b/lib/trace-ir/packet-header-field.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include struct bt_field *bt_packet_header_field_borrow_field( diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c index 51bce30e..63177d7a 100644 --- a/lib/trace-ir/packet.c +++ b/lib/trace-ir/packet.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/trace-ir/resolve-field-path.c b/lib/trace-ir/resolve-field-path.c index 40bc7fcc..0254dd42 100644 --- a/lib/trace-ir/resolve-field-path.c +++ b/lib/trace-ir/resolve-field-path.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c index dfef7436..763f81ab 100644 --- a/lib/trace-ir/stream-class.c +++ b/lib/trace-ir/stream-class.c @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/trace-ir/trace-class.c b/lib/trace-ir/trace-class.c index 709810ef..1d2c8097 100644 --- a/lib/trace-ir/trace-class.c +++ b/lib/trace-ir/trace-class.c @@ -38,14 +38,14 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/trace.c b/lib/trace-ir/trace.c index 94e88d3d..7cf2f2c4 100644 --- a/lib/trace-ir/trace.c +++ b/lib/trace-ir/trace.c @@ -39,14 +39,14 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/utils.c b/lib/trace-ir/utils.c index 4addffc2..00dc7578 100644 --- a/lib/trace-ir/utils.c +++ b/lib/trace-ir/utils.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/values.c b/lib/value.c similarity index 99% rename from lib/values.c rename to lib/value.c index c9be2254..e4a0d1e4 100644 --- a/lib/values.c +++ b/lib/value.c @@ -31,12 +31,12 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/plugins/libctfcopytrace/clock-fields.c b/plugins/libctfcopytrace/clock-fields.c index 1e28c899..5f7c7246 100644 --- a/plugins/libctfcopytrace/clock-fields.c +++ b/plugins/libctfcopytrace/clock-fields.c @@ -33,7 +33,7 @@ #include #include -#include "clock-fields.h" +#include "clock-field.h" static int find_update_struct_clock_fields(FILE *err, struct bt_field_type *type, diff --git a/plugins/libctfcopytrace/ctfcopytrace.c b/plugins/libctfcopytrace/ctfcopytrace.c index fc3f8592..62ce7425 100644 --- a/plugins/libctfcopytrace/ctfcopytrace.c +++ b/plugins/libctfcopytrace/ctfcopytrace.c @@ -33,7 +33,7 @@ #include #include "ctfcopytrace.h" -#include "clock-fields.h" +#include "clock-field.h" BT_HIDDEN const struct bt_clock_class *ctf_copy_clock_class(FILE *err, diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 4da898bd..c317a7b0 100644 --- a/plugins/text/dmesg/dmesg.c +++ b/plugins/text/dmesg/dmesg.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index c75ed207..1d273beb 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c index c0503d25..29e9951b 100644 --- a/plugins/utils/trimmer/iterator.c +++ b/plugins/utils/trimmer/iterator.c @@ -137,7 +137,7 @@ int update_lazy_bound(struct trimmer_bound *bound, const char *name, } tm.tm_sec = bound->lazy_values.ss; tm.tm_min = bound->lazy_values.mm; - tm.tm_hour = bound->lazy_values.hh; + tm.tm_hour = bound->lazy_value.hh; timeval = bt_timegm(&tm); if (timeval < 0) { BT_LOGE("Failure in bt_timegm(), incorrectly formatted %s timestamp", @@ -152,7 +152,7 @@ int update_lazy_bound(struct trimmer_bound *bound, const char *name, } tm.tm_sec = bound->lazy_values.ss; tm.tm_min = bound->lazy_values.mm; - tm.tm_hour = bound->lazy_values.hh; + tm.tm_hour = bound->lazy_value.hh; timeval = mktime(&tm); if (timeval < 0) { BT_LOGE("Failure in mktime(), incorrectly formatted %s timestamp", diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c index ba4053f9..21dc871a 100644 --- a/plugins/utils/trimmer/trimmer.c +++ b/plugins/utils/trimmer/trimmer.c @@ -135,7 +135,7 @@ int timestamp_from_param(const char *param_name, struct bt_value *param, if (ret == 4) { if (!trimmer->date) { /* We don't know which day until we get an event. */ - result_bound->lazy_values.hh = hh; + result_bound->lazy_value.hh = hh; result_bound->lazy_values.mm = mm; result_bound->lazy_values.ss = ss; result_bound->lazy_values.ns = ns; @@ -227,7 +227,7 @@ int timestamp_from_param(const char *param_name, struct bt_value *param, if (ret == 3) { if (!trimmer->date) { /* We don't know which day until we get an event. */ - result_bound->lazy_values.hh = hh; + result_bound->lazy_value.hh = hh; result_bound->lazy_values.mm = mm; result_bound->lazy_values.ss = ss; result_bound->lazy_values.ns = 0; diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index a893188d..c3608701 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include -- 2.34.1