From fe309bab200801b0e5824fadc75aed2abe7aed56 Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Sat, 1 Mar 2025 15:29:06 +0100
Subject: [PATCH] pcryptofolder missed a rename

---
 pclsync/pcryptofolder.c | 4 ++--
 pclsync/pcryptofolder.h | 2 +-
 pclsync/pmemlock.c      | 4 ++--
 pclsync/psynclib.c      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pclsync/pcryptofolder.c b/pclsync/pcryptofolder.c
index de36436..1c915f5 100644
--- a/pclsync/pcryptofolder.c
+++ b/pclsync/pcryptofolder.c
@@ -96,7 +96,7 @@ typedef struct {
 
 void sha1_hex_null_term(const void *data, size_t len, char *out);
 
-void pcryptofolder_clean_cache() {
+void pcryptofolder_cache_clean() {
   const char *prefixes[] = {"DKEY", "FKEY", "FLDE", "FLDD", "SEEN"};
   pcache_clean_oneof(prefixes, ARRAY_SIZE(prefixes));
 }
@@ -686,7 +686,7 @@ int pcryptofolder_lock() {
   crypto_privkey = PSYNC_INVALID_RSA;
   pthread_rwlock_unlock(&crypto_lock);
   debug(D_NOTICE, "stopped crypto");
-  pcryptofolder_clean_cache();
+  pcryptofolder_cache_clean();
   psync_fs_refresh_crypto_folders();
   return PSYNC_CRYPTO_STOP_SUCCESS;
 }
diff --git a/pclsync/pcryptofolder.h b/pclsync/pcryptofolder.h
index e3fd334..37acd9b 100644
--- a/pclsync/pcryptofolder.h
+++ b/pclsync/pcryptofolder.h
@@ -50,10 +50,10 @@
 #define PSYNC_CRYPTO_FAILED_SECTOR_ENCODER                                     \
   ((psync_crypto_aes256_sector_encoder_decoder_t)(PSYNC_CRYPTO_MAX_ERROR + 3))
 
+void pcryptofolder_cache_clean();
 void pcryptofolder_cache_cleanf();
 int pcryptofolder_change_pass(const char *oldpassphrase, const char *newpassphrase, uint32_t flags, char **privenc, char **sign);
 int pcryptofolder_change_pass_unlocked(const char *newpassphrase, uint32_t flags, char **privenc, char **sign);
-void pcryptofolder_clean_cache();
 psync_crypto_aes256_sector_encoder_decoder_t pcryptofolder_filencoder_from_binresult(psync_fileid_t fileid, binresult *res);
 psync_crypto_aes256_sector_encoder_decoder_t pcryptofolder_filencoder_get(psync_fsfileid_t fileid, uint64_t hash, int nonetwork);
 char *pcryptofolder_filencoder_key_get(psync_fsfileid_t fileid, uint64_t hash, size_t *keylen);
diff --git a/pclsync/pmemlock.c b/pclsync/pmemlock.c
index 644ee64..1958764 100644
--- a/pclsync/pmemlock.c
+++ b/pclsync/pmemlock.c
@@ -123,7 +123,7 @@ retry:
         tryn++;
         pthread_mutex_unlock(&page_mutex);
         debug(D_NOTICE, "mlock failed, trying to clean cache");
-        pcryptofolder_clean_cache();
+        pcryptofolder_cache_clean();
         goto retry;
       } else {
         debug(D_WARNING, "mlock for page %lx failed even after cache clean",
@@ -248,7 +248,7 @@ void *pmemlock_malloc(size_t size) {
   bestsize = ~((size_t)0);
   brange = NULL;
   boffset = 0; // just to make compilers happy
-  // psync_mem_lock may call pcryptofolder_clean_cache(), which in turn can
+  // psync_mem_lock may call pcryptofolder_cache_clean(), which in turn can
   // call pmemlock_free() on few pointers, therefore allocator_mutex is
   // recursive
   pthread_mutex_lock(&allocator_mutex);
diff --git a/pclsync/psynclib.c b/pclsync/psynclib.c
index 4cce660..9e4f4b7 100644
--- a/pclsync/psynclib.c
+++ b/pclsync/psynclib.c
@@ -3238,7 +3238,7 @@ void psync_delete_cached_crypto_keys() {
       "'crypto_private_salt', 'crypto_private_sha1', 'crypto_public_sha1')");
   if (psync_sql_affected_rows()) {
     debug(D_NOTICE, "deleted cached crypto keys");
-    pcryptofolder_clean_cache();
+    pcryptofolder_cache_clean();
   }
   psync_sql_statement("DELETE FROM cryptofolderkey");
   psync_sql_statement("DELETE FROM cryptofilekey");