From dfb8399d6432f0382d0403efa92c7d5e9c35e811 Mon Sep 17 00:00:00 2001 From: Levi Neely <141506390+lneely@users.noreply.github.com> Date: Sat, 1 Mar 2025 22:20:15 +0100 Subject: [PATCH] transient and unnecessary includes --- pclsync/pdiff.c | 1 + pclsync/pdownload.c | 2 ++ pclsync/pdownload.h | 2 +- pclsync/pfolder.c | 1 + pclsync/pfs.h | 2 +- pclsync/pfstasks.h | 2 +- pclsync/pfsupload.c | 1 + pclsync/pfsupload.h | 2 +- pclsync/pfsxattr.h | 5 +++-- pclsync/plibs.c | 2 ++ pclsync/plibs.h | 4 +++- pclsync/plocalnotify.h | 2 +- pclsync/plocalscan.h | 2 +- pclsync/pnetlibs.c | 8 +------- pclsync/pnetlibs.h | 3 +-- pclsync/pnotify.c | 2 +- pclsync/ppagecache.c | 1 + pclsync/ptask.h | 2 ++ pclsync/ptools.c | 1 + 19 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pclsync/pdiff.c b/pclsync/pdiff.c index b183399..0d367b3 100644 --- a/pclsync/pdiff.c +++ b/pclsync/pdiff.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "paccountevents.h" #include "papi.h" diff --git a/pclsync/pdownload.c b/pclsync/pdownload.c index c31455a..9dc6f22 100644 --- a/pclsync/pdownload.c +++ b/pclsync/pdownload.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "pqevent.h" #include "pdownload.h" @@ -48,6 +49,7 @@ #include "ptimer.h" #include "pupload.h" #include "ppath.h" +#include "pfile.h" extern const unsigned char pfile_invalid_chars[]; diff --git a/pclsync/pdownload.h b/pclsync/pdownload.h index 3af5644..b69ae3c 100644 --- a/pclsync/pdownload.h +++ b/pclsync/pdownload.h @@ -33,7 +33,7 @@ #define _PSYNC_DOWNLOAD_H #include "psettings.h" -#include "psynclib.h" +#include "pfoldersync.h" typedef unsigned char psync_hex_hash[PSYNC_HASH_DIGEST_HEXLEN]; diff --git a/pclsync/pfolder.c b/pclsync/pfolder.c index 214bbfb..3d4ea94 100644 --- a/pclsync/pfolder.c +++ b/pclsync/pfolder.c @@ -42,6 +42,7 @@ #include "pnetlibs.h" #include "psys.h" #include "ppath.h" +#include "pfile.h" #include #include diff --git a/pclsync/pfs.h b/pclsync/pfs.h index 792e24d..438dbaf 100644 --- a/pclsync/pfs.h +++ b/pclsync/pfs.h @@ -41,7 +41,7 @@ #include "pintervaltree.h" #include "plibs.h" #include "psettings.h" -#include "psynclib.h" +#include "pfoldersync.h" #include "ptimer.h" #include "ptree.h" diff --git a/pclsync/pfstasks.h b/pclsync/pfstasks.h index 03112d8..55bb980 100644 --- a/pclsync/pfstasks.h +++ b/pclsync/pfstasks.h @@ -36,9 +36,9 @@ #include #include +#include "pfoldersync.h" #include "pfsfolder.h" #include "plibs.h" -#include "psynclib.h" #include "ptree.h" #define PSYNC_FS_TASK_MKDIR 1 diff --git a/pclsync/pfsupload.c b/pclsync/pfsupload.c index 1a35bb2..1085ee3 100644 --- a/pclsync/pfsupload.c +++ b/pclsync/pfsupload.c @@ -42,6 +42,7 @@ #include "pcache.h" #include "pdiff.h" +#include "pfile.h" #include "pfileops.h" #include "pfscrypto.h" #include "pfstasks.h" diff --git a/pclsync/pfsupload.h b/pclsync/pfsupload.h index f0c98c2..f9f8520 100644 --- a/pclsync/pfsupload.h +++ b/pclsync/pfsupload.h @@ -32,7 +32,7 @@ #ifndef _PSYNC_FSUPLOAD_H #define _PSYNC_FSUPLOAD_H -#include "psynclib.h" +#include void psync_fsupload_init(); void psync_fsupload_wake(); diff --git a/pclsync/pfsxattr.h b/pclsync/pfsxattr.h index 10b2993..49f4304 100644 --- a/pclsync/pfsxattr.h +++ b/pclsync/pfsxattr.h @@ -32,8 +32,9 @@ #ifndef _PSYNC_FSXATTR_H #define _PSYNC_FSXATTR_H -#include "pfile.h" -#include "psynclib.h" +#include + +#include "pfoldersync.h" #define PFS_XATTR_IGN diff --git a/pclsync/plibs.c b/pclsync/plibs.c index 1af1c7b..c2865d1 100644 --- a/pclsync/plibs.c +++ b/pclsync/plibs.c @@ -42,6 +42,8 @@ #include #include #include +#include +#include "pfile.h" // required by psync_debug extern PSYNC_THREAD const char *psync_thread_name; diff --git a/pclsync/plibs.h b/pclsync/plibs.h index ed9d289..569f87f 100644 --- a/pclsync/plibs.h +++ b/pclsync/plibs.h @@ -35,10 +35,12 @@ #include #include "pcompiler.h" +#include "pstatus.h" #include "putil.h" -#include "psynclib.h" +#include "psynclib.h" // need for macros... #include +#include #include #define D_NONE 0 diff --git a/pclsync/plocalnotify.h b/pclsync/plocalnotify.h index db34277..2a943bb 100644 --- a/pclsync/plocalnotify.h +++ b/pclsync/plocalnotify.h @@ -32,7 +32,7 @@ #ifndef _PSYNC_LOCALNOTIFY_H #define _PSYNC_LOCALNOTIFY_H -#include "psynclib.h" +#include "pfoldersync.h" int psync_localnotify_init(); void psync_localnotify_add_sync(psync_syncid_t syncid); diff --git a/pclsync/plocalscan.h b/pclsync/plocalscan.h index 27a8928..641eec7 100644 --- a/pclsync/plocalscan.h +++ b/pclsync/plocalscan.h @@ -32,7 +32,7 @@ #ifndef _PSYNC_LOCALSCAN_H #define _PSYNC_LOCALSCAN_H -#include "psynclib.h" +#include "pfoldersync.h" void psync_localscan_init(); void psync_wake_localscan(); diff --git a/pclsync/pnetlibs.c b/pclsync/pnetlibs.c index 1fd6e0d..3b7806e 100644 --- a/pclsync/pnetlibs.c +++ b/pclsync/pnetlibs.c @@ -36,13 +36,6 @@ #include #include -#include -#include -#include -#include -#include -#include - #include "papi.h" #include "pcache.h" #include "pdevice.h" @@ -56,6 +49,7 @@ #include "ppath.h" #include "psys.h" #include "ptree.h" +#include "pfile.h" // required by psync_send_debug extern PSYNC_THREAD const char *psync_thread_name; diff --git a/pclsync/pnetlibs.h b/pclsync/pnetlibs.h index 9d5ed86..871b34d 100644 --- a/pclsync/pnetlibs.h +++ b/pclsync/pnetlibs.h @@ -33,9 +33,8 @@ #define _PSYNC_NETLIBS_H #include "papi.h" -#include "pfile.h" #include "plist.h" -#include "psynclib.h" +#include "pfoldersync.h" #define senddebug(str, ...) \ do { \ diff --git a/pclsync/pnotify.c b/pclsync/pnotify.c index a959a84..cf0c6b7 100644 --- a/pclsync/pnotify.c +++ b/pclsync/pnotify.c @@ -33,10 +33,10 @@ #include "plibs.h" #include "pnetlibs.h" #include "psettings.h" -#include "ptimer.h" #include "ptree.h" #include "ppath.h" #include "prun.h" +#include "pfile.h" typedef struct { diff --git a/pclsync/ppagecache.c b/pclsync/ppagecache.c index 20f8a61..f99fc40 100644 --- a/pclsync/ppagecache.c +++ b/pclsync/ppagecache.c @@ -49,6 +49,7 @@ #include "ppath.h" #include "psys.h" #include "putil.h" +#include "pfile.h" #include "pstatus.h" #include "ptimer.h" diff --git a/pclsync/ptask.h b/pclsync/ptask.h index e56a77e..cfe352b 100644 --- a/pclsync/ptask.h +++ b/pclsync/ptask.h @@ -32,6 +32,8 @@ #ifndef _PSYNC_TASKS_H #define _PSYNC_TASKS_H +#include + #include "pfoldersync.h" #define PSYNC_ASYNC_ERR_FLAG_PERM \ diff --git a/pclsync/ptools.c b/pclsync/ptools.c index 461cbdc..c81e07d 100644 --- a/pclsync/ptools.c +++ b/pclsync/ptools.c @@ -47,6 +47,7 @@ #include #include #include +#include char *ptools_get_mac_addr() { char buffer[128];