moved HLPSONEQ and HLPSAVAIL from typedefs.h to helper.h, SIGHDLR to tools.h, STDIRSE...

diff --git a/src/SwapDir.h b/src/SwapDir.h
index adb21dab76250b01bcccc796bb944645c0017167..8374b1e7c410c7b43d2587a992cb7064cb5fa81b 100644 (file)
--- a/src/SwapDir.h
+++ b/src/SwapDir.h
@@ -24,6 +24,8 @@ class HttpRequestMethod;
 /* Store dir configuration routines */
 /* SwapDir *sd, char *path ( + char *opt later when the strtok mess is gone) */
 
+typedef int STDIRSELECT(const StoreEntry *);
+
 class ConfigOption;
 
 /// hides memory/disk cache distinction from callers

diff --git a/src/helper.h b/src/helper.h
index 2b3dcc95c1e66e9441cb774a633513f7501750aa..14007b6117b4c1aec8ca639b7b8d41c8cfc930f8 100644 (file)
--- a/src/helper.h
+++ b/src/helper.h
@@ -26,6 +26,11 @@
 
 class Packable;
 
+/// callback type for helper empty-queue event
+typedef void HLPSONEQ(void *);
+/// callback type for helper-available event
+typedef int HLPSAVAIL(void *);
+
 /**
  * Managers a set of individual helper processes with a common queue of requests.
  *

diff --git a/src/tools.h b/src/tools.h
index afd055c7e5848be238a0920921a158f537b3bf04..7e14651fbd0b778b00da3226b121687693747604 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -36,6 +36,9 @@ typedef void (*ObjPackMethod) (void *obj, Packable * p);
 /* packs, then prints an object using debugs() */
 void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);
 
+/// callback type for signal handlers
+typedef void SIGHDLR(int sig);
+
 const char *getMyHostname(void);
 const char *uniqueHostname(void);
 

diff --git a/src/typedefs.h b/src/typedefs.h
index 2068e78dbef78dfb6b52e0331b89c1e0df43ad05..e9d469749450a07ff45e04830a7c8cdbd2f9b6ef 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -62,11 +62,6 @@ typedef int READ_HANDLER(int, char *, int);
 typedef int QS(const void *, const void *); /* qsort */
 typedef void STABH(void *);
 class StoreEntry;
-typedef void SIGHDLR(int sig);
-typedef void STVLDCB(void *, int, int);
-typedef int HLPSAVAIL(void *);
-typedef void HLPSONEQ(void *);
-typedef void HLPCMDOPTS(int *argc, char **argv);
 
 /* MD5 cache keys */
 typedef unsigned char cache_key;
@@ -74,8 +69,6 @@ typedef unsigned char cache_key;
 /* in case we want to change it later */
 typedef ssize_t mb_size_t;
 
-typedef int STDIRSELECT(const StoreEntry *);
-
 /*Use uint64_t to store miliseconds*/
 typedef uint64_t time_msec_t;
 #endif /* SQUID_TYPEDEFS_H */