Fix coding style

diff --git a/args.c b/args.c
index 1eb9c263321e76d38d6544da85b43ab73f7fd763..cff4873ff22d4cf02f7332a932f1a3384b4c36dc 100644 (file)
--- a/args.c
+++ b/args.c
@@ -177,7 +177,7 @@ args_insert(struct args *dest, int index, struct args *src, bool replace)
                return;
        }
 
-       dest->argv = (char**)x_realloc(
+       dest->argv = (char **)x_realloc(
                dest->argv,
                (src->argc + dest->argc + 1 - offset) *
                sizeof(char *));
@@ -214,7 +214,8 @@ args_free(struct args *args)
 void
 args_add(struct args *args, const char *s)
 {
-       args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
+       args->argv = (char **)x_realloc(args->argv,
+                                       (args->argc + 2) * sizeof(char *));
        args->argv[args->argc] = x_strdup(s);
        args->argc++;
        args->argv[args->argc] = NULL;
@@ -263,7 +264,8 @@ args_remove_first(struct args *args)
 void
 args_add_prefix(struct args *args, const char *s)
 {
-       args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
+       args->argv = (char **)x_realloc(args->argv,
+                                       (args->argc + 2) * sizeof(char *));
        memmove(&args->argv[1], &args->argv[0],
                (args->argc+1) * sizeof(args->argv[0]));
        args->argv[0] = x_strdup(s);

diff --git a/ccache.h b/ccache.h
index b2f15f7221494e387b47ba7eca16d6de5a00654c..18a2b9ef194a15a60b4820291d7f30a1eb537ff9 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -92,7 +92,7 @@ void hash_buffer(struct mdfour *md, const void *s, size_t len);
 char *hash_result(struct mdfour *md);
 void hash_result_as_bytes(struct mdfour *md, unsigned char *out);
 bool hash_equal(struct mdfour *md1, struct mdfour *md2);
-void hash_delimiter(struct mdfour *md, const char* type);
+void hash_delimiter(struct mdfour *md, const char *type);
 void hash_string(struct mdfour *md, const char *s);
 void hash_int(struct mdfour *md, int x);
 bool hash_fd(struct mdfour *md, int fd);

diff --git a/conf.c b/conf.c
index a971b6f14fb781ee721e29000d8759a70387dbd5..0f62b86bf2b15c1c0474c325ee78da9d75c55860 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -314,7 +314,7 @@ conf_create(void)
        conf->temporary_dir = x_strdup("");
        conf->umask = UINT_MAX; /* default: don't set umask */
        conf->unify = false;
-       conf->item_origins = x_malloc(CONFITEMS_TOTAL_KEYWORDS * sizeof(char*));
+       conf->item_origins = x_malloc(CONFITEMS_TOTAL_KEYWORDS * sizeof(char *));
        for (i = 0; i < CONFITEMS_TOTAL_KEYWORDS; ++i) {
                conf->item_origins[i] = "default";
        }

diff --git a/util.c b/util.c
index 071035901c4ed3d1c163a7b6351c1ff165690910..d51a62c30c7f44aa385e5c4095caed1141ed3db5 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1275,7 +1275,7 @@ x_unlink(const char *path)
         * file. We don't care if the temp file is trashed, so it's always safe to
         * unlink it first.
         */
-       char* tmp_name = format("%s.%s.rmXXXXXX", path, tmp_string());
+       char *tmp_name = format("%s.%s.rmXXXXXX", path, tmp_string());
        int result = 0;
        cc_log("Unlink %s via %s", path, tmp_name);
        if (x_rename(path, tmp_name) == -1) {