log: Drop _SE logs

These are used incosistently. No benefit from _E/_SE logs known.

Change-Id: If33cd93240ddf6d30e07ada9f23342ae309fce4d

diff --git a/src/shared/log.h b/src/shared/log.h
index 0710ec6..8ee72b2 100644 (file)
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -57,10 +57,5 @@ static inline char __dlog_prio(int prio)
 #define _W(fmt, arg...) do { if (DLOG_LOG_LEVEL <= DLOG_WARN)  SLOGW(fmt, ##arg); } while (0)
 #define _E(fmt, arg...) do { if (DLOG_LOG_LEVEL <= DLOG_ERROR) SLOGE(fmt, ##arg); } while (0)
 
-#define _SD(fmt, arg...) SECURE_SLOGD(fmt, ##arg)
-#define _SI(fmt, arg...) SECURE_SLOGI(fmt, ##arg)
-#define _SW(fmt, arg...) SECURE_SLOGW(fmt, ##arg)
-#define _SE(fmt, arg...) SECURE_SLOGE(fmt, ##arg)
-
 #endif
 /* __CRASH_LOG_H__ */

diff --git a/src/shared/util.c b/src/shared/util.c
index 76889e5..239ebee 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -134,7 +134,7 @@ int copy_file(char *dst, char *src)
        dfd = open(dst, O_WRONLY|O_CREAT|O_EXCL, 0644);
        if (dfd < 0) {
                close(sfd);
-               _SE("Failed to open (%s)\n", dst);
+               _E("Failed to open (%s)\n", dst);
                return -1;
        }
 
@@ -165,7 +165,7 @@ int dump_file_write_fd(int dfd, char *src)
        }
        sfd = open(src, O_RDONLY);
        if (sfd < 0) {
-               _SE("Failed to open (%s)\n", src);
+               _E("Failed to open (%s)\n", src);
                return -1;
        }
 
@@ -221,7 +221,7 @@ static int remove_dir_internal(int fd)
                                continue;
                        subfd = openat(fd, de->d_name, O_RDONLY | O_DIRECTORY);
                        if (subfd < 0) {
-                               _SE("Couldn't openat %s: %d\n", de->d_name, errno);
+                               _E("Couldn't openat %s: %d\n", de->d_name, errno);
                                ret = -1;
                                continue;
                        }
@@ -229,12 +229,12 @@ static int remove_dir_internal(int fd)
                                ret = -1;
                        close(subfd);
                        if (unlinkat(fd, de->d_name, AT_REMOVEDIR) < 0) {
-                               _SE("Couldn't unlinkat %s: %d\n", de->d_name, errno);
+                               _E("Couldn't unlinkat %s: %d\n", de->d_name, errno);
                                ret = -1;
                        }
                } else {
                        if (unlinkat(fd, de->d_name, 0) < 0) {
-                               _SE("Couldn't unlinkat %s: %d\n", de->d_name, errno);
+                               _E("Couldn't unlinkat %s: %d\n", de->d_name, errno);
                                ret = -1;
                        }
                }
@@ -251,7 +251,7 @@ int remove_dir(const char *path, int del_dir)
                return -1;
        fd = open(path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
        if (fd < 0) {
-               _SE("Couldn't opendir %s: %d\n", path, errno);
+               _E("Couldn't opendir %s: %d\n", path, errno);
                return -errno;
        }
        ret = remove_dir_internal(fd);
@@ -259,7 +259,7 @@ int remove_dir(const char *path, int del_dir)
 
        if (del_dir) {
                if (rmdir(path)) {
-                       _SE("Couldn't rmdir %s: %d\n", path, errno);
+                       _E("Couldn't rmdir %s: %d\n", path, errno);
                        ret = -1;
                }
        }
@@ -359,7 +359,7 @@ off_t get_directory_usage(char *path)
                if (!strncmp(de->d_name, ".", 2) || !strncmp(de->d_name, "..", 3))
                        continue;
                if (fstatat(fd, de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) {
-                       _SE("Failed to fstatat  %s: %d\n", de->d_name, errno);
+                       _E("Failed to fstatat  %s: %d\n", de->d_name, errno);
                        continue;
                }
                usage += st.st_size;