Fix code style 74/140474/1
authorSangyoon Jang <jeremy.jang@samsung.com>
Tue, 25 Jul 2017 06:14:10 +0000 (15:14 +0900)
committerSangyoon Jang <jeremy.jang@samsung.com>
Tue, 25 Jul 2017 06:17:48 +0000 (15:17 +0900)
Change-Id: Ice9a07a1cbca9b2fec964a79184ceab6af9edc1e
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
src/install_preload_pkg.c

index 4ed08f9..58439e5 100644 (file)
@@ -58,7 +58,7 @@ static int _install_preload_pkg(const char *backend, const char *directory,
                bool readonly)
 {
        DIR *dir;
-       struct dirent *file_info = NULL;
+       struct dirent *file_info;
        int ret;
        char file_path[BUFSZE];
        char err_buf[BUFSZE];
@@ -69,7 +69,7 @@ static int _install_preload_pkg(const char *backend, const char *directory,
                        _D("The directory for preloaded pkgs doesn't exist");
                        return 0;
                } else {
-                       _E("Failed to access the [%s] because [%s]", directory,
+                       _E("Failed to access [%s]: [%s]", directory,
                                strerror_r(errno, err_buf, sizeof(err_buf)));
                        return -1;
                }
@@ -88,7 +88,7 @@ static int _install_preload_pkg(const char *backend, const char *directory,
                pid_t pid = fork();
                if (pid == 0) {
                        execl(backend, backend, "-i", file_path,
-                               readonly? "--preload":"--preload-rw",
+                               readonly ? "--preload" : "--preload-rw",
                                (char *)NULL);
                } else if (pid < 0) {
                        _E("failed to fork and execute %s!", backend);
@@ -101,12 +101,13 @@ static int _install_preload_pkg(const char *backend, const char *directory,
                        waitpid(pid, &status, 0);
                }
 
-               /* remove a file after installation */
-               /* keep rw packages for factory-reset */
+               /* remove a file after installation,
+                * keep rw packages for factory-reset
+                */
                if (readonly) {
                        ret = remove(file_path);
                        if (ret < 0) {
-                               _E("Failed to remove the file [%s] because [%s]",
+                               _E("Failed to remove [%s]: [%s]",
                                        file_path, strerror_r(errno, err_buf,
                                        sizeof(err_buf)));
                                closedir(dir);
@@ -123,7 +124,7 @@ static int _install_preload_pkg(const char *backend, const char *directory,
 static int _is_authorized(uid_t uid)
 {
        /* install_preload_pkg should be called by as root privilege. */
-       if ((uid_t) OWNER_ROOT == uid)
+       if ((uid_t)OWNER_ROOT == uid)
                return 1;
        else
                return 0;
@@ -133,7 +134,7 @@ int main(int argc, char *argv[])
 {
        char err_msg[BUFSZE];
        int handle = -1;
-       int ret = 0;
+       int ret;
 
        if (!_is_authorized(getuid())) {
                _E("You are not an authorized user!");
@@ -161,8 +162,7 @@ error:
                _E("Failed to open error file");
                return -1;
        }
-       snprintf(err_msg, sizeof(err_msg),
-               "install_preload_pkg error!\n");
+       snprintf(err_msg, sizeof(err_msg), "install_preload_pkg error!\n");
        ret = write(handle, err_msg, strlen(err_msg));
        if (ret == -1)
                _E("Failed to write an error message. (%d)", errno);