Alphabetize HIS_STATS_? features, but remove HIS_STATS_h.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1345 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 5e5c0349b0c7d3020a8e8ebce50e4f16048c62fb..26eb3a64ab340c5a64973a8fee84bed5d5e0cda5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-03-29  Michael Poole <mdpoole@troilus.org>
+
+       * doc/example.conf: Remove no-longer-used HIS_STATS_h.
+
+       * doc/readme.features: Likewise.
+
+       * include/ircd_features.h: Likewise.
+
+       * ircd/ircd_features.c: Likewise.
+
+2005-03-20  Reed Loden <reed@reedloden.com>
+
+       * include/ircd_features.h: Alphabetize HIS_STATS_? features.
+
+       * ircd/ircd_features.c: Likewise.
+
 2005-03-29  Michael Poole <mdpoole@troilus.org>
        (The previously unapplied part of another patch (by Carlo Wood?).)
 

diff --git a/doc/example.conf b/doc/example.conf
index 31cf5f4320b3386598fd41255a1a5e0846063142..ba82716f70e2165e42cc26979a68bc45a0553964 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -818,7 +818,6 @@ features
 #  "HIS_STATS_e" = "TRUE";
 #  "HIS_STATS_f" = "TRUE";
 #  "HIS_STATS_g" = "TRUE";
-#  "HIS_STATS_h" = "TRUE";
 #  "HIS_STATS_i" = "TRUE";
 #  "HIS_STATS_j" = "TRUE";
 #  "HIS_STATS_J" = "TRUE";

diff --git a/doc/readme.features b/doc/readme.features
index c0761d2434969d15349f0414606972f06ef1b0a2..4a3ed80cf2d3365acc76b619f871e19646840a59 100644 (file)
--- a/doc/readme.features
+++ b/doc/readme.features
@@ -519,12 +519,6 @@ HIS_STATS_g
 
 As per UnderNet CFV-165, this removes /STATS g from users.
 
-HIS_STATS_h
- * Type: boolean
- * Default: TRUE
-
-As per UnderNet CFV-165, this removes /STATS h from users.
-
 HIS_STATS_k
  * Type: boolean
  * Default: TRUE

diff --git a/include/ircd_features.h b/include/ircd_features.h
index 1c24c30d297b55664ce5f38fd7733f712456ec9f..e4b2f4e3b5b298b815a8de5d8d59d348fd8d234e 100644 (file)
--- a/include/ircd_features.h
+++ b/include/ircd_features.h
@@ -103,17 +103,18 @@ enum Feature {
   FEAT_HIS_MAP,
   FEAT_HIS_LINKS,
   FEAT_HIS_TRACE,
-  FEAT_HIS_STATS_l,
-  FEAT_HIS_STATS_L,
   FEAT_HIS_STATS_a,
   FEAT_HIS_STATS_c,
-  FEAT_HIS_STATS_g,
-  FEAT_HIS_STATS_h,
-  FEAT_HIS_STATS_k,
+  FEAT_HIS_STATS_d,
+  FEAT_HIS_STATS_e,
   FEAT_HIS_STATS_f,
+  FEAT_HIS_STATS_g,
   FEAT_HIS_STATS_i,
   FEAT_HIS_STATS_j,
   FEAT_HIS_STATS_J,
+  FEAT_HIS_STATS_k,
+  FEAT_HIS_STATS_l,
+  FEAT_HIS_STATS_L,
   FEAT_HIS_STATS_M,
   FEAT_HIS_STATS_m,
   FEAT_HIS_STATS_o,
@@ -121,8 +122,6 @@ enum Feature {
   FEAT_HIS_STATS_q,
   FEAT_HIS_STATS_R,
   FEAT_HIS_STATS_r,
-  FEAT_HIS_STATS_d,
-  FEAT_HIS_STATS_e,
   FEAT_HIS_STATS_t,
   FEAT_HIS_STATS_T,
   FEAT_HIS_STATS_u,

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
index ce9851f60e678d03a03f14dcb27f8d2ca9cc9bcc..aa5acf36f4c7e581f25b1fdb120bef74f0edd174 100644 (file)
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -342,17 +342,18 @@ static struct FeatureDesc {
   F_B(HIS_MAP, 0, 1, 0),
   F_B(HIS_LINKS, 0, 1, 0),
   F_B(HIS_TRACE, 0, 1, 0),
-  F_B(HIS_STATS_l, 0, 1, 0),
-  F_B(HIS_STATS_L, 0, 1, 0),
   F_B(HIS_STATS_a, 0, 1, 0),
   F_B(HIS_STATS_c, 0, 1, 0),
-  F_B(HIS_STATS_g, 0, 1, 0),
-  F_B(HIS_STATS_h, 0, 1, 0),
-  F_B(HIS_STATS_k, 0, 1, 0),
+  F_B(HIS_STATS_d, 0, 1, 0),
+  F_B(HIS_STATS_e, 0, 1, 0),
   F_B(HIS_STATS_f, 0, 1, 0),
+  F_B(HIS_STATS_g, 0, 1, 0),
   F_B(HIS_STATS_i, 0, 1, 0),
   F_B(HIS_STATS_j, 0, 1, 0),
   F_B(HIS_STATS_J, 0, 1, 0),
+  F_B(HIS_STATS_k, 0, 1, 0),
+  F_B(HIS_STATS_l, 0, 1, 0),
+  F_B(HIS_STATS_L, 0, 1, 0),
   F_B(HIS_STATS_M, 0, 1, 0),
   F_B(HIS_STATS_m, 0, 1, 0),
   F_B(HIS_STATS_o, 0, 1, 0),
@@ -360,8 +361,6 @@ static struct FeatureDesc {
   F_B(HIS_STATS_q, 0, 1, 0),
   F_B(HIS_STATS_R, 0, 1, 0),
   F_B(HIS_STATS_r, 0, 1, 0),
-  F_B(HIS_STATS_d, 0, 1, 0),
-  F_B(HIS_STATS_e, 0, 1, 0),
   F_B(HIS_STATS_t, 0, 1, 0),
   F_B(HIS_STATS_T, 0, 1, 0),
   F_B(HIS_STATS_u, 0, 0, 0),