Format code with uncrustify

diff --git a/src/ccache.c b/src/ccache.c
index 8bdf2a1ddfe817222a8d9d15489a27e439b6c73e..00d35a36a94942868550048e5ff0462545d6a5eb 100644 (file)
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -485,7 +485,7 @@ clean_up_internal_tempdir(void)
        time_t now = time(NULL);
        struct stat st;
        if (x_stat(conf->cache_dir, &st) != 0
-                       || st.st_mtime + k_tempdir_cleanup_interval >= now) {
+           || st.st_mtime + k_tempdir_cleanup_interval >= now) {
                // No cleanup needed.
                return;
        }
@@ -505,7 +505,7 @@ clean_up_internal_tempdir(void)
 
                char *path = format("%s/%s", temp_dir(), entry->d_name);
                if (x_lstat(path, &st) == 0
-                               && st.st_mtime + k_tempdir_cleanup_interval < now) {
+                   && st.st_mtime + k_tempdir_cleanup_interval < now) {
                        tmp_unlink(path);
                }
                free(path);

diff --git a/src/confitems.c b/src/confitems.c
index 1c24464105fb3b610e3feb84e054ae46da962d8e..d9d14bdd5b724d7e68ed629b69d78e402e1c0cd8 100644 (file)
--- a/src/confitems.c
+++ b/src/confitems.c
@@ -20,7 +20,7 @@
 static char *
 format_string(const void *value)
 {
-       const char * const *str = (const char * const*)value;
+       const char *const *str = (const char *const *)value;
        return x_strdup(*str);
 }
 
@@ -268,7 +268,7 @@ confitem_format_unsigned(const void *value)
 bool
 confitem_verify_absolute_path(const void *value, char **errmsg)
 {
-       const char * const *path = (const char * const *)value;
+       const char *const *path = (const char *const *)value;
        assert(*path);
        if (str_eq(*path, "")) {
                // The empty string means "disable" in this case.

diff --git a/src/util.c b/src/util.c
index 2dbe6652cc6d97b8446cd73a5c2c9ac2d7f774ac..262aa6a6254b445cba0adfbcab852ecf8767b7e7 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1227,8 +1227,7 @@ localtime_r(const time_t *timep, struct tm *result)
        if (tm) {
                *result = *tm;
                return result;
-       }
-       else {
+       } else {
                memset(result, 0, sizeof(*result));
                return NULL;
        }

diff --git a/unittest/test_conf.c b/unittest/test_conf.c
index 886bd28537f0d333285c531af351a468b3595d37..7dba8571cf6e6dc50ffda16340683b8374194b81 100644 (file)
--- a/unittest/test_conf.c
+++ b/unittest/test_conf.c
@@ -369,7 +369,8 @@ TEST(conf_set_new_value)
        char *data;
 
        create_file("ccache.conf", "path = vanilla\n");
-       CHECKM(conf_set_value_in_file("ccache.conf", "compiler", "chocolate", &errmsg),
+       CHECKM(conf_set_value_in_file("ccache.conf", "compiler", "chocolate",
+                                     &errmsg),
               errmsg);
        data = read_text_file("ccache.conf", 0);
        CHECK(data);