From 8069c49981eff72474a5e042439fa210df40ae4a Mon Sep 17 00:00:00 2001 From: Mateusz Majewski Date: Wed, 29 Jul 2020 08:54:17 +0200 Subject: [PATCH] Move loglimiter to shared After all, it is shared between libdlog and dlogctl. Change-Id: I34b08f935e4eacbae3f505e08214432aaee84720 --- Makefile.am | 12 ++++++------ src/{libdlog => shared}/loglimiter.c | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename src/{libdlog => shared}/loglimiter.c (100%) diff --git a/Makefile.am b/Makefile.am index b1628b4..8faf510 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ libdlog_la_SOURCES = \ src/shared/queued_entry.c \ src/shared/translate_syslog.c \ src/libdlog/dynamic_config.c \ - src/libdlog/loglimiter.c \ + src/shared/loglimiter.c \ src/libdlog/log_pipe.c \ src/libdlog/log_android.c @@ -169,7 +169,7 @@ dlogctl_SOURCES = \ src/shared/logcommon.c \ src/shared/logconfig.c \ src/shared/parsers.c \ - src/libdlog/loglimiter.c \ + src/shared/loglimiter.c \ src/logctl/logctl.c bin_PROGRAMS += dlog_cleanup @@ -335,11 +335,11 @@ src_tests_test_common_pos_SOURCES = src/tests/test_common_pos.c src/shared/logco src_tests_test_common_pos_CFLAGS = $(check_CFLAGS) src_tests_test_common_pos_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=sendmsg,--wrap=recvmsg,--wrap=writev,--wrap=read,--wrap=poll,--wrap=fcntl,--wrap=fcntl64,--wrap=malloc,--wrap=calloc,--wrap=connect,--wrap=socket,--wrap=open,--wrap=open64,--wrap=ioctl -src_tests_limiter_pos_SOURCES = src/tests/limiter_pos.c src/libdlog/loglimiter.c src/shared/logconfig.c src/shared/logcommon.c src/shared/parsers.c +src_tests_limiter_pos_SOURCES = src/tests/limiter_pos.c src/shared/loglimiter.c src/shared/logconfig.c src/shared/logcommon.c src/shared/parsers.c src_tests_limiter_pos_CFLAGS = $(check_CFLAGS) src_tests_limiter_pos_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=snprintf,--wrap=malloc,--wrap=time -src_tests_limiter_neg_SOURCES = src/tests/limiter_neg.c src/libdlog/loglimiter.c src/shared/logconfig.c src/shared/logcommon.c src/shared/parsers.c +src_tests_limiter_neg_SOURCES = src/tests/limiter_neg.c src/shared/loglimiter.c src/shared/logconfig.c src/shared/logcommon.c src/shared/parsers.c src_tests_limiter_neg_CFLAGS = $(check_CFLAGS) src_tests_limiter_neg_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=snprintf,--wrap=malloc,--wrap=time @@ -439,7 +439,7 @@ src_tests_queued_entry_monotonic_pos_SOURCES = src/tests/queued_entry_pos.c src/ src_tests_queued_entry_monotonic_pos_CFLAGS = $(check_CFLAGS) -DUSE_ANDROID_MONOTONIC src_tests_queued_entry_monotonic_pos_LDFLAGS = $(AM_LDFLAGS) -src_tests_logctl_SOURCES = src/tests/logctl.c src/logctl/logctl.c src/shared/parsers.c src/shared/logconfig.c src/libdlog/loglimiter.c src/shared/logcommon.c +src_tests_logctl_SOURCES = src/tests/logctl.c src/logctl/logctl.c src/shared/parsers.c src/shared/logconfig.c src/shared/loglimiter.c src/shared/logcommon.c src_tests_logctl_CFLAGS = $(check_CFLAGS) src_tests_logctl_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=calloc,--wrap=asprintf,--wrap=open,--wrap=open64,--wrap=fdopen,--wrap=fdopen64,--wrap=mkstemp,--wrap=mkstemp64,--wrap=fchmod,--wrap=rename @@ -553,7 +553,7 @@ src_tests_salvage_pipe_entry_LDFLAGS = $(AM_LDFLAGS) src_tests_critical_log_SOURCES = src/tests/critical_log.c \ src/libdlog/log.c \ - src/libdlog/loglimiter.c \ + src/shared/loglimiter.c \ src/libdlog/dynamic_config.c \ src/shared/logcommon.c \ src/shared/logconfig.c \ diff --git a/src/libdlog/loglimiter.c b/src/shared/loglimiter.c similarity index 100% rename from src/libdlog/loglimiter.c rename to src/shared/loglimiter.c -- 2.7.4