Update coding convention & file-service added.

[platform/framework/web/livebox-viewer.git] / src / critical_log.c

diff --git a/src/critical_log.c b/src/critical_log.c
index 8b626c5..07bb71d 100644 (file)
--- a/src/critical_log.c
+++ b/src/critical_log.c
@@ -1,11 +1,11 @@
 /*
- * Copyright 2012  Samsung Electronics Co., Ltd
+ * Copyright 2013  Samsung Electronics Co., Ltd
  *
- * Licensed under the Flora License, Version 1.0 (the "License");
+ * Licensed under the Flora License, Version 1.1 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.tizenopensource.org/license
+ * http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,6 +30,7 @@
 #include "debug.h"
 #include "util.h"
 #include "critical_log.h"
+#include "livebox-errno.h" /* For error code */
 
 static struct {
        FILE *fp;
@@ -51,8 +52,9 @@ int critical_log(const char *func, int line, const char *fmt, ...)
        int ret;
        struct timeval tv;
 
-       if (!s_info.fp)
-               return -EIO;
+       if (!s_info.fp) {
+               return LB_STATUS_ERROR_IO;
+       }
 
        gettimeofday(&tv, NULL);
        fprintf(s_info.fp, "%d %lu.%lu [%s:%d] ", getpid(), tv.tv_sec, tv.tv_usec, util_basename((char *)func), line);
@@ -73,12 +75,16 @@ int critical_log(const char *func, int line, const char *fmt, ...)
                if (filename) {
                        snprintf(filename, namelen, "%s/%d_%s", SLAVE_LOG_PATH, s_info.file_id, s_info.filename);
 
-                       if (s_info.fp)
-                               fclose(s_info.fp);
+                       if (s_info.fp) {
+                               if (fclose(s_info.fp) != 0) {
+                                       ErrPrint("fclose: %s\n", strerror(errno));
+                               }
+                       }
 
                        s_info.fp = fopen(filename, "w+");
-                       if (!s_info.fp)
+                       if (!s_info.fp) {
                                ErrPrint("Failed to open a file: %s\n", filename);
+                       }
 
                        free(filename);
                }
@@ -95,13 +101,14 @@ int critical_log_init(const char *name)
        int namelen;
        char *filename;
 
-       if (s_info.fp)
+       if (s_info.fp) {
                return 0;
+       }
 
        s_info.filename = strdup(name);
        if (!s_info.filename) {
                ErrPrint("Failed to create a log file\n");
-               return -ENOMEM;
+               return LB_STATUS_ERROR_MEMORY;
        }
 
        namelen = strlen(name) + strlen(SLAVE_LOG_PATH) + 20;
@@ -111,7 +118,7 @@ int critical_log_init(const char *name)
                ErrPrint("Failed to create a log file\n");
                free(s_info.filename);
                s_info.filename = NULL;
-               return -ENOMEM;
+               return LB_STATUS_ERROR_MEMORY;
        }
 
        snprintf(filename, namelen, "%s/%d_%s", SLAVE_LOG_PATH, s_info.file_id, name);
@@ -122,7 +129,7 @@ int critical_log_init(const char *name)
                free(s_info.filename);
                s_info.filename = NULL;
                free(filename);
-               return -EIO;
+               return LB_STATUS_ERROR_IO;
        }
 
        free(filename);
@@ -139,7 +146,9 @@ int critical_log_fini(void)
        }
 
        if (s_info.fp) {
-               fclose(s_info.fp);
+               if (fclose(s_info.fp) != 0) {
+                       ErrPrint("fclose: %s\n", strerror(errno));
+               }
                s_info.fp = NULL;
        }