Testability refactor

Makefile

@@ -173,6 +173,7 @@ TEST_BINS := \
 	tests/test_plocks \
 	tests/test_pfsupload \
 	tests/test_ppagecache \
+	tests/test_pfs_helpers
 	tests/test_pfs_helpers \
 	tests/test_pdiff_helpers \
 	tests/test_plocalscan_helpers

pclsync/debug/pnetlibs_debug.c

@@ -13,7 +13,7 @@
 // Internal helpers (debug-only)
 // --------------------------------------------------------------------------
 
-void pident(int ident) {
+static void pident(int ident) {
   VAR_ARRAY(b, char, ident + 1);
   memset(b, '\t', ident);
   b[ident] = 0;

pclsync/pcryptofolder.c

@@ -1620,7 +1620,7 @@ static int get_fldr_name(psync_folderid_t folderid,
   }
 }
 
-int psync_cloud_crypto_send_mkdir(psync_folderid_t folderid, const char *name,
+static int psync_cloud_crypto_send_mkdir(psync_folderid_t folderid, const char *name,
                                   const char **err, const char *b64key,
                                   size_t b64keylen,
                                   psync_encrypted_symmetric_key_t encsym,
@@ -1789,7 +1789,7 @@ int pcryptofolder_mkdir(psync_folderid_t folderid, const char *name,
   return ret;
 }
 
-int psync_pcloud_crypto_reencode_key(
+static int psync_pcloud_crypto_reencode_key(
     const unsigned char *rsapub, size_t rsapublen, const unsigned char *rsapriv,
     size_t rsaprivlen, const char *oldpassphrase, const char *newpassphrase,
     uint32_t flags, char **privenc, char **sign) {
@@ -1919,7 +1919,7 @@ int psync_pcloud_crypto_reencode_key(
   return PSYNC_CRYPTO_BAD_PASSPHRASE;
 }
 
-int psync_pcloud_crypto_encode_key(const char *newpassphrase, uint32_t flags,
+static int psync_pcloud_crypto_encode_key(const char *newpassphrase, uint32_t flags,
                                    char **privenc, char **sign) {
   unsigned char *newpriv;
   priv_key_ver1 *rsapriv_struct;

pclsync/pfscrypto.c

@@ -1455,7 +1455,7 @@ int pfs_crpt_read_mod(psync_openfile_t *of, char *buf,
   return pfs_unlock_ret(of, size);
 }
 
-int pfs_crpt_write_mod_nu(psync_openfile_t *of,
+static int pfs_crpt_write_mod_nu(psync_openfile_t *of,
                                              const char *buf, uint64_t size,
                                              uint64_t offset,
                                              int checkextender);
@@ -1487,7 +1487,7 @@ static int pfs_modfile_fillzero(psync_openfile_t *of, uint64_t size,
   return 0;
 }
 
-int pfs_crpt_write_mod_nu(psync_openfile_t *of,
+static int pfs_crpt_write_mod_nu(psync_openfile_t *of,
                                              const char *buf, uint64_t size,
                                              uint64_t offset,
                                              int checkextender) {

pclsync/pfstasks.c

@@ -819,7 +819,7 @@ static psync_fsfileid_t get_file_at_old_location(psync_fsfileid_t fileid) {
   return ret;
 }
 
-void pfs_task_stop_and_delete_file(psync_fsfileid_t fileid) {
+static void pfs_task_stop_and_delete_file(psync_fsfileid_t fileid) {
   psync_sql_res *res;
   pdbg_logf(D_NOTICE, "trying to stop upload of task %lu", (unsigned long)-fileid);
   if (pfs_upld_in_current_small_uploads_batch_locked(-fileid)) {

pclsync/pfsupload.c

@@ -926,7 +926,7 @@ static int upload_modify_read_req(psock_t *api) {
     return PSYNC_NET_OK;
 }
 
-int upload_modify(uint64_t taskid, psync_folderid_t folderid, const char *name,
+static int upload_modify(uint64_t taskid, psync_folderid_t folderid, const char *name,
                   const char *filename, const char *indexname,
                   psync_fileid_t fileid, uint64_t hash, uint64_t writeid,
                   const char *key) {

pclsync/pnetlibs.c

@@ -660,7 +660,7 @@ psock_t *psync_api_connect_download() {
   return sock;
 }
 
-void psync_socket_close_download(psock_t *sock) {
+static void psync_socket_close_download(psock_t *sock) {
   psock_close(sock);
 }
 

pclsync/ppagecache.c

@@ -4246,7 +4246,7 @@ void ppagecache_init() {
                        NULL);
 }
 
-void clean_cache_del(void *delcache, ppath_stat *st) {
+static void clean_cache_del(void *delcache, ppath_stat *st) {
   int ret;
   if (!pfile_stat_isfolder(&st->stat) &&
       (delcache ||

pclsync/pssl.c

@@ -164,7 +164,7 @@ void pssl_debug_cb(pssl_debug_callback_t cb, void *ctx) {
   debug_ctx = ctx;
 }
 
-int rng_get(void *p_rng, unsigned char *output, size_t output_len) {
+static int rng_get(void *p_rng, unsigned char *output, size_t output_len) {
   rng_ctx *rng;
   int ret;
   rng = (rng_ctx *)p_rng;

pclsync/psynclib.c

@@ -130,7 +130,7 @@ static void ssl_debug_cb(void *ctx, int level, const char *msg, int TODO1,
         TODO1); // trying to figure out what these are...
 }
 
-void psync_set_ssl_debug_callback(pssl_debug_callback_t cb) {
+static void psync_set_ssl_debug_callback(pssl_debug_callback_t cb) {
   pssl_log_threshold(PSYNC_SSL_DEBUG_LEVEL);
   pssl_debug_cb(cb, NULL);
 }
@@ -436,7 +436,7 @@ apiservers_list_t *psync_get_apiservers(char **err) {
   return ret;
 }
 
-void psync_reset_apiserver() {
+static void psync_reset_apiserver() {
   psync_set_apiserver(PSYNC_API_HOST, PSYNC_LOCATIONID_DEFAULT);
 }
 
@@ -2296,7 +2296,7 @@ int psync_is_folder_syncable(char *localPath, char **errMsg) {
   return 0;
 }
 
-psync_folderid_t create_bup_mach_folder(char **msgErr) {
+static psync_folderid_t create_bup_mach_folder(char **msgErr) {
   binresult *rootFolIdObj;
   binresult *retData;
 
@@ -2518,7 +2518,7 @@ char *get_backup_root_name() {
 
 char *get_pc_name() { return ptools_get_machine_name(); }
 
-void psync_async_delete_sync(void *ptr) {
+static void psync_async_delete_sync(void *ptr) {
   psync_syncid_t syncId = (psync_syncid_t)(uintptr_t)ptr;
   int res;
 

pclsync/publiclinks.c

@@ -757,7 +757,7 @@ int do_psync_delete_link(int64_t linkid, char **err /*OUT*/) {
   return 0;
 }
 
-int process_bres(const char *cmd, binresult *bres, psock_t *api,
+static int process_bres(const char *cmd, binresult *bres, psock_t *api,
                  char **err) {
   const char *errorret;
   int result;
@@ -1324,7 +1324,7 @@ void cache_links_all() {
     pmem_free(PMEM_SUBSYS_OTHER, err);
 }
 
-int do_delete_all_links(int64_t folderid, int64_t fileid, char **err) {
+static int do_delete_all_links(int64_t folderid, int64_t fileid, char **err) {
   psync_sql_res *res;
   psync_uint_row row;
   int ret = 0;

pclsync/pupload.c

@@ -323,7 +323,7 @@ static int task_renamefile(uint64_t taskid, psync_syncid_t syncid,
     return task_renameremotefile(fileid, folderid, newname);
 }
 
-int handle_api_errors(sync_err_struct *err_struct) {
+static int handle_api_errors(sync_err_struct *err_struct) {
   int ret = -1;
   event_data_struct *event_data;
   psync_syncid_t syncId;