Add a helper function for core Android buffers

Change-Id: I86fd88f689c651fd03a34b4e636bfc1d9cdd66ac
Signed-off-by: Michal Bloch <m.bloch@samsung.com>

diff --git a/include/logcommon.h b/include/logcommon.h
index 2976ad5..9c14d04 100644 (file)
--- a/include/logcommon.h
+++ b/include/logcommon.h
@@ -89,6 +89,20 @@ static inline void close_fd(int *fd)
                close(*fd);
 }
 
+static inline bool is_core_buffer(log_id_t buf_id)
+{
+       static bool const is_core [LOG_ID_MAX] = {
+               [LOG_ID_MAIN  ] = true,
+               [LOG_ID_SYSTEM] = true,
+               [LOG_ID_RADIO ] = true,
+               [LOG_ID_APPS  ] = true,
+       };
+
+       if (buf_id < 0 || buf_id >= NELEMS(is_core))
+               return false;
+       return is_core [buf_id];
+}
+
 char * log_name_by_id(log_id_t id);
 log_id_t log_id_by_name(const char *name);
 

diff --git a/src/logger/logger.c b/src/logger/logger.c
index eb856c3..1fe8430 100644 (file)
--- a/src/logger/logger.c
+++ b/src/logger/logger.c
@@ -1139,8 +1139,7 @@ static int reader_logger_init(struct reader_logger **reader, log_id_t buf_id, st
        assert(reader);
        assert(buf_id > LOG_ID_INVALID);
        assert(buf_id < LOG_ID_MAX);
-       assert(buf_id != LOG_ID_KMSG);
-       assert(buf_id != LOG_ID_SYSLOG);
+       assert(is_core_buffer(buf_id));
        assert(server);
 
        __attribute__((cleanup(reader_logger_cleanup))) struct reader_logger *ret = reader_logger_alloc();
@@ -2584,7 +2583,7 @@ void parse_logfile_config(void *value, void *userdata)
        get_dlogutil_line_params(configline, &params);
 
        int r;
-       if (g_backend.use_logger_by_default && params.buf_id != LOG_ID_KMSG && params.buf_id != LOG_ID_SYSLOG) {
+       if (g_backend.use_logger_by_default && is_core_buffer(params.buf_id)) {
                struct reader_logger *reader = NULL;
                r = create_reader_logger_from_dlogutil_line(&params, server, &reader);
                if (r == 0)