Use typedefs of the relevant enums for store_status, swap_status and ping_status...

diff --git a/src/Store.h b/src/Store.h
index fde6afcb3385c02687195cc575b272b40dabb711..16ad35b58ab6b6255c2f4e986c48f2b565e26cd2 100644 (file)
--- a/src/Store.h
+++ b/src/Store.h
@@ -60,8 +60,6 @@ class MemObject;
 class Store;
 class StoreSearch;
 
-typedef unsigned int ping_status_t;
-
 /**
  \ingroup StoreAPI
  */
@@ -141,24 +139,19 @@ public:
     u_short flags;
     /* END OF ON-DISK STORE_META_STD */
 
-sfileno swap_filen:
-    25;
+    sfileno swap_filen:25;
+
+    sdirno swap_dirn:7;
 
-sdirno swap_dirn:
-    7;
     u_short lock_count;                /* Assume < 65536! */
 
-mem_status_t mem_status:
-    3;
+    mem_status_t mem_status:3;
 
-ping_status_t ping_status:
-    3;
+    ping_status_t ping_status:3;
 
-store_status_t store_status:
-    3;
+    store_status_t store_status:3;
 
-swap_status_t swap_status:
-    3;
+    swap_status_t swap_status:3;
 
 public:
     static size_t inUseCount();

diff --git a/src/enums.h b/src/enums.h
index 1de8ef8d930ad941c5660f5d487488169f204541..3184fada414df41884d067215d1f565870d41aa2 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -216,22 +216,22 @@ typedef enum _mem_status_t {
     IN_MEMORY
 } mem_status_t;
 
-enum {
+typedef enum {
     PING_NONE,
     PING_WAITING,
     PING_DONE
-};
+} ping_status_t;
 
-enum {
+typedef enum {
     STORE_OK,
     STORE_PENDING
-};
+} store_status_t;
 
-enum {
+typedef enum {
     SWAPOUT_NONE,
     SWAPOUT_WRITING,
     SWAPOUT_DONE
-};
+} swap_status_t;
 
 typedef enum {
     STORE_NON_CLIENT,

diff --git a/src/typedefs.h b/src/typedefs.h
index 89252437131953563ab4470941faccecedfc06fa..9c8fb001a029fcd065a334c23f386ffba021322d 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -36,9 +36,6 @@
 #ifndef SQUID_TYPEDEFS_H
 #define SQUID_TYPEDEFS_H
 
-typedef unsigned int store_status_t;
-//MOVED src/Store.h (only use)         typedef unsigned int ping_status_t;
-typedef unsigned int swap_status_t;
 typedef signed int sfileno;
 typedef signed int sdirno;