Issue #604, fix m_dnsbl, broken in accccc212cd4f08a3c5532b1ae7a17e76bac8718

[user/henk/code/inspircd.git] / include / ctables.h

diff --git a/include/ctables.h b/include/ctables.h
index 02bea198df48cb844de65f30b0094b70d5604bc5..f6d7129375e0bfef3371164ce3d3eb8f93f20b50 100644 (file)
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -21,8 +21,7 @@
  */
 
 
-#ifndef CTABLES_H
-#define CTABLES_H
+#pragma once
 
 /** Used to indicate command success codes
  */
@@ -44,7 +43,6 @@ const char FLAG_SERVERONLY = 7; // technically anything nonzero below 'A' works
  */
 enum TranslateType
 {
-       TR_END,                 /* End of known parameters, everything after this is TR_TEXT */
        TR_TEXT,                /* Raw text, leave as-is */
        TR_NICK,                /* Nickname, translate to UUID for server->server */
        TR_CUSTOM               /* Custom translation handled by EncodeParameter/DecodeParameter */
@@ -120,10 +118,6 @@ class CoreExport Command : public ServiceProvider
         */
        unsigned long use_count;
 
-       /** used by /stats m
-        */
-       unsigned long total_bytes;
-
        /** True if the command is disabled to non-opers
         */
        bool disabled;
@@ -132,6 +126,15 @@ class CoreExport Command : public ServiceProvider
         */
        bool works_before_reg;
 
+       /** True if the command allows an empty last parameter.
+        * When false and the last parameter is empty, it's popped BEFORE
+        * checking there are enough params, etc. (i.e. the handler won't
+        * be called if there aren't enough params after popping the empty
+        * param).
+        * True by default
+        */
+       bool allow_empty_last_param;
+
        /** Syntax string for the command, displayed if non-empty string.
         * This takes place of the text in the 'not enough parameters' numeric.
         */
@@ -155,7 +158,8 @@ class CoreExport Command : public ServiceProvider
         */
        Command(Module* me, const std::string &cmd, int minpara = 0, int maxpara = 0) :
                ServiceProvider(me, cmd, SERVICE_COMMAND), flags_needed(0), min_params(minpara), max_params(maxpara),
-               use_count(0), total_bytes(0), disabled(false), works_before_reg(false), Penalty(1)
+               use_count(0), disabled(false), works_before_reg(false), allow_empty_last_param(true),
+               Penalty(1)
        {
        }
 
@@ -242,5 +246,3 @@ class CoreExport SplitCommand : public Command
        translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);
 #define TRANSLATE8(x1,x2,x3,x4,x5,x6,x7,x8)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
        translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);translation.push_back(x8);
-
-#endif