Fix grammar in cleanup_* function names

diff --git a/ccache.c b/ccache.c
index 7d05af4dc3b76158e4b82f60f60ab8ea6f960935..099380b65415166fbf912ebeda67512391c988b8 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -1,7 +1,7 @@
 // ccache -- a fast C/C++ compiler cache
 //
 // Copyright (C) 2002-2007 Andrew Tridgell
-// Copyright (C) 2009-2017 Joel Rosdahl
+// Copyright (C) 2009-2018 Joel Rosdahl
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
@@ -3342,7 +3342,7 @@ ccache_main_options(int argc, char *argv[])
 
                case 'c': // --cleanup
                        initialize();
-                       cleanup_all(conf);
+                       clean_up_all(conf);
                        printf("Cleaned cache\n");
                        break;
 

diff --git a/ccache.h b/ccache.h
index 2c5d64ddd199d578985dc44eb11c737c20513e05..2bae451b2d181e1abd4c4e5719c2e22828864d4b 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -217,8 +217,8 @@ void exitfn_call(void);
 // ----------------------------------------------------------------------------
 // cleanup.c
 
-void cleanup_dir(struct conf *conf, const char *dir);
-void cleanup_all(struct conf *conf);
+void clean_up_dir(struct conf *conf, const char *dir);
+void clean_up_all(struct conf *conf);
 void wipe_all(struct conf *conf);
 
 // ----------------------------------------------------------------------------

diff --git a/cleanup.c b/cleanup.c
index f6f363f1f3f62be5111cb4d1d2a871ee3354ce07..bbd13800b686d6e381da50dff883e9db717ef52c 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -170,7 +170,7 @@ sort_and_clean(void)
 
 // Clean up one cache subdirectory.
 void
-cleanup_dir(struct conf *conf, const char *dir)
+clean_up_dir(struct conf *conf, const char *dir)
 {
        cc_log("Cleaning up cache directory %s", dir);
 
@@ -217,11 +217,11 @@ cleanup_dir(struct conf *conf, const char *dir)
 }
 
 // Clean up all cache subdirectories.
-void cleanup_all(struct conf *conf)
+void clean_up_all(struct conf *conf)
 {
        for (int i = 0; i <= 0xF; i++) {
                char *dname = format("%s/%1x", conf->cache_dir, i);
-               cleanup_dir(conf, dname);
+               clean_up_dir(conf, dname);
                free(dname);
        }
 }
@@ -274,5 +274,5 @@ void wipe_all(struct conf *conf)
        }
 
        // Fix the counters.
-       cleanup_all(conf);
+       clean_up_all(conf);
 }

diff --git a/stats.c b/stats.c
index 4576c3c516fb9f6dbc58714f704c8d6867e30d2c..e07a2a9b4a48fcdebcad520ea43aac98f0540c66 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -395,7 +395,7 @@ stats_flush(void)
        }
 
        if (need_cleanup) {
-               cleanup_dir(conf, subdir);
+               clean_up_dir(conf, subdir);
        }
 
        free(subdir);