Define -1 in the log_id_t

    - log_id_t is enum type which -1 isn't defined
    - So, if (id < 0) returns false though id is -1

Change-Id: I28bad625b00269e0f3256517b449c7a50efe8a38
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/include/dlog-internal.h b/include/dlog-internal.h
index e2e2075..7f7456a 100755 (executable)
--- a/include/dlog-internal.h
+++ b/include/dlog-internal.h
@@ -51,7 +51,8 @@ extern "C" {
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @elseif TV 3.0 @endif
  */
 typedef enum {
-    LOG_ID_MAIN = 0,
+       LOG_ID_INVALID = -1,
+       LOG_ID_MAIN,
        LOG_ID_RADIO,
        LOG_ID_SYSTEM,
        LOG_ID_APPS,

diff --git a/src/libdlog/log.c b/src/libdlog/log.c
index 291f055..b24e885 100755 (executable)
--- a/src/libdlog/log.c
+++ b/src/libdlog/log.c
@@ -88,7 +88,7 @@ static inline const char* dlog_id_to_string(log_id_t log_id)
                [LOG_ID_APPS]   = "log_apps",
        };
 
-       if (log_id < 0 || log_id >= LOG_ID_MAX || !id_table[log_id])
+       if (log_id == LOG_ID_INVALID || log_id >= LOG_ID_MAX || !id_table[log_id])
                return "UNKNOWN";
 
        return id_table[log_id];
@@ -164,7 +164,7 @@ static int __write_to_log_kmsg(log_id_t log_id, log_priority prio, const char *t
        char buf[LOG_ATOMIC_SIZE];
        const char *msg_ptr = msg;
 
-       if (log_id < LOG_ID_MAX)
+       if (log_id > LOG_ID_INVALID && log_id < LOG_ID_MAX)
                log_fd = log_fds[log_id];
        else
                return DLOG_ERROR_INVALID_PARAMETER;
@@ -205,7 +205,7 @@ static int __write_to_log_logger(log_id_t log_id, log_priority prio, const char
        int log_fd;
        struct iovec vec[3];
 
-       if (log_id < LOG_ID_MAX)
+       if (log_id > LOG_ID_INVALID && log_id < LOG_ID_MAX)
                log_fd = log_fds[log_id];
        else
                return DLOG_ERROR_INVALID_PARAMETER;
@@ -300,7 +300,7 @@ static int dlog_should_log(log_id_t log_id, const char* tag, int prio)
        if (!tag)
                return DLOG_ERROR_INVALID_PARAMETER;
 
-       if (log_id < 0 || LOG_ID_MAX <= log_id)
+       if (log_id == LOG_ID_INVALID || LOG_ID_MAX <= log_id)
                return DLOG_ERROR_INVALID_PARAMETER;
 
        if (log_id != LOG_ID_APPS && !config.lc_plog)

diff --git a/src/logger/logger.c b/src/logger/logger.c
index 0c3198b..fda87c1 100755 (executable)
--- a/src/logger/logger.c
+++ b/src/logger/logger.c
@@ -100,8 +100,8 @@ static int min_interval = 0;
  */
 static int check_device(int id)
 {
-       if (id < 0 || LOG_ID_MAX <= id)
-               return 0;
+       if (id == LOG_ID_INVALID || LOG_ID_MAX <= id)
+               return -1;
 
        return (device_list[id] == true) ? 0 : -1;
 }
@@ -111,7 +111,7 @@ static int check_device(int id)
  */
 static int register_device(int id)
 {
-       if (id < 0 || LOG_ID_MAX <= id)
+       if (id == LOG_ID_INVALID || LOG_ID_MAX <= id)
                return -1;
        device_list[id] = true;
 
@@ -455,7 +455,7 @@ static struct log_device *device_new(int id)
 {
        struct log_device *dev;
 
-       if (LOG_ID_MAX <= id)
+       if (id == LOG_ID_INVALID || LOG_ID_MAX <= id)
                return NULL;
        dev = malloc(sizeof(struct log_device));
        if (dev == NULL) {
@@ -631,7 +631,7 @@ static int parse_command_line(char *linebuffer, struct log_command *cmd)
                case 'b':
                        id = log_id_by_name(optarg);
                        _D("command device name %s id %d\n", optarg, id);
-                       if (id < 0)
+                       if (id == LOG_ID_INVALID)
                                break;
                        cmd->option_buffer = true;
                        /* enable to log in device on/off struct */

diff --git a/src/logutil/logutil.c b/src/logutil/logutil.c
index 6caedd3..6f8a15c 100755 (executable)
--- a/src/logutil/logutil.c
+++ b/src/logutil/logutil.c
@@ -589,7 +589,7 @@ int main_others(int argc, char **argv)
 
                case 'b': {
                                          id = log_id_by_name(optarg);
-                                         if (id < 0) {
+                                         if (id == LOG_ID_INVALID) {
                                                  _E("Unknown log buffer %s\n", optarg);
                                                  exit(-1);
                                          }

diff --git a/src/shared/logcommon.c b/src/shared/logcommon.c
index 4854ce9..109c809 100644 (file)
--- a/src/shared/logcommon.c
+++ b/src/shared/logcommon.c
@@ -106,5 +106,5 @@ log_id_t log_id_by_name(const char *name)
        else if (0 == strcmp(name, "apps"))
                return LOG_ID_APPS;
        else
-               return -1;
+               return LOG_ID_INVALID;
 }