From b8aa6f43348c4eaf4b266a772a623110e7fd9198 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 6 Apr 2021 20:17:04 -0400 Subject: [PATCH] Move string-utils.h to 'src/common/' Change-Id: I2c56997580f40728d60701b7e899af8bc8f4bd57 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- src/common/Makefile.am | 2 ++ src/{lib/lttng-ust/string-utils.c => common/strutils.c} | 2 +- src/{lib/lttng-ust/string-utils.h => common/strutils.h} | 0 src/lib/lttng-ust/Makefile.am | 2 -- src/lib/lttng-ust/lttng-bytecode-interpreter.c | 2 +- src/lib/lttng-ust/lttng-bytecode-validator.c | 2 +- src/lib/lttng-ust/lttng-events.c | 2 +- src/lib/lttng-ust/lttng-ust-abi.c | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename src/{lib/lttng-ust/string-utils.c => common/strutils.c} (99%) rename src/{lib/lttng-ust/string-utils.h => common/strutils.h} (100%) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index f89dd1c3..f5345041 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -145,6 +145,8 @@ libcommon_la_SOURCES = \ getenv.h \ logging.c \ logging.h \ + strutils.c \ + strutils.h \ patient.c libcommon_la_LIBADD = \ diff --git a/src/lib/lttng-ust/string-utils.c b/src/common/strutils.c similarity index 99% rename from src/lib/lttng-ust/string-utils.c rename to src/common/strutils.c index dea2ae3b..fadfe495 100644 --- a/src/lib/lttng-ust/string-utils.c +++ b/src/common/strutils.c @@ -10,7 +10,7 @@ #include #include -#include "string-utils.h" +#include "common/strutils.h" enum star_glob_pattern_type_flags { STAR_GLOB_PATTERN_TYPE_FLAG_NONE = 0, diff --git a/src/lib/lttng-ust/string-utils.h b/src/common/strutils.h similarity index 100% rename from src/lib/lttng-ust/string-utils.h rename to src/common/strutils.h diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am index 4bd39a3c..55be93f6 100644 --- a/src/lib/lttng-ust/Makefile.am +++ b/src/lib/lttng-ust/Makefile.am @@ -82,8 +82,6 @@ liblttng_ust_runtime_la_SOURCES = \ lttng-ust-tracef-provider.h \ tracelog.c \ lttng-ust-tracelog-provider.h \ - string-utils.c \ - string-utils.h \ event-notifier-notification.c \ rculfhash.c \ rculfhash.h \ diff --git a/src/lib/lttng-ust/lttng-bytecode-interpreter.c b/src/lib/lttng-ust/lttng-bytecode-interpreter.c index c5f75629..e28e113a 100644 --- a/src/lib/lttng-ust/lttng-bytecode-interpreter.c +++ b/src/lib/lttng-ust/lttng-bytecode-interpreter.c @@ -17,7 +17,7 @@ #include "lib/lttng-ust/events.h" #include "lttng-bytecode.h" -#include "string-utils.h" +#include "common/strutils.h" /* diff --git a/src/lib/lttng-ust/lttng-bytecode-validator.c b/src/lib/lttng-ust/lttng-bytecode-validator.c index 9f127f78..1a3649c1 100644 --- a/src/lib/lttng-ust/lttng-bytecode-validator.c +++ b/src/lib/lttng-ust/lttng-bytecode-validator.c @@ -15,7 +15,7 @@ #include "lttng-bytecode.h" #include "common/hash.h" -#include "string-utils.h" +#include "common/strutils.h" #include "lib/lttng-ust/events.h" #include "common/macros.h" diff --git a/src/lib/lttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c index b33d6e1b..bff03a8e 100644 --- a/src/lib/lttng-ust/lttng-events.c +++ b/src/lib/lttng-ust/lttng-events.c @@ -42,7 +42,7 @@ #include "lttng-ust-uuid.h" #include "tracepoint-internal.h" -#include "string-utils.h" +#include "common/strutils.h" #include "lttng-bytecode.h" #include "lttng-tracer.h" #include "lttng-tracer-core.h" diff --git a/src/lib/lttng-ust/lttng-ust-abi.c b/src/lib/lttng-ust/lttng-ust-abi.c index f8e0f5bb..4b876811 100644 --- a/src/lib/lttng-ust/lttng-ust-abi.c +++ b/src/lib/lttng-ust/lttng-ust-abi.c @@ -45,7 +45,7 @@ #include "common/counter/counter.h" #include "tracepoint-internal.h" #include "lttng-tracer.h" -#include "string-utils.h" +#include "common/strutils.h" #include "lib/lttng-ust/events.h" #include "context-internal.h" #include "common/macros.h" -- 2.34.1