[trac1040] Put messages into alphabetical order

... and remove the now-redundant spaces between the message ID and
the text of the message. (With the expansion of message IDs, the
alignment of the text within the file was destroyed.)

src/lib/log/log_messages.cc

@@ -1,4 +1,4 @@
-// File created from log_messages.mes on Wed Jun 22 10:38:51 2011
+// File created from log_messages.mes on Wed Jun 22 11:54:57 2011
 
 #include <cstddef>
 #include <log/message_types.h>
@@ -10,16 +10,16 @@ namespace log {
 extern const isc::log::MessageID LOG_BAD_DESTINATION = "LOG_BAD_DESTINATION";
 extern const isc::log::MessageID LOG_BAD_SEVERITY = "LOG_BAD_SEVERITY";
 extern const isc::log::MessageID LOG_BAD_STREAM = "LOG_BAD_STREAM";
-extern const isc::log::MessageID LOG_DUPLICATE_NAMESPACE = "LOG_DUPLICATE_NAMESPACE";
 extern const isc::log::MessageID LOG_DUPLICATE_MESSAGE_ID = "LOG_DUPLICATE_MESSAGE_ID";
-extern const isc::log::MessageID LOG_NO_SUCH_MESSAGE = "LOG_NO_SUCH_MESSAGE";
+extern const isc::log::MessageID LOG_DUPLICATE_NAMESPACE = "LOG_DUPLICATE_NAMESPACE";
+extern const isc::log::MessageID LOG_INPUT_OPEN_FAIL = "LOG_INPUT_OPEN_FAIL";
 extern const isc::log::MessageID LOG_INVALID_MESSAGE_ID = "LOG_INVALID_MESSAGE_ID";
-extern const isc::log::MessageID LOG_NO_MESSAGE_ID = "LOG_NO_MESSAGE_ID";
-extern const isc::log::MessageID LOG_NO_MESSAGE_TEXT = "LOG_NO_MESSAGE_TEXT";
 extern const isc::log::MessageID LOG_NAMESPACE_EXTRA_ARGS = "LOG_NAMESPACE_EXTRA_ARGS";
 extern const isc::log::MessageID LOG_NAMESPACE_INVALID_ARG = "LOG_NAMESPACE_INVALID_ARG";
 extern const isc::log::MessageID LOG_NAMESPACE_NO_ARGS = "LOG_NAMESPACE_NO_ARGS";
-extern const isc::log::MessageID LOG_INPUT_OPEN_FAIL = "LOG_INPUT_OPEN_FAIL";
+extern const isc::log::MessageID LOG_NO_MESSAGE_ID = "LOG_NO_MESSAGE_ID";
+extern const isc::log::MessageID LOG_NO_MESSAGE_TEXT = "LOG_NO_MESSAGE_TEXT";
+extern const isc::log::MessageID LOG_NO_SUCH_MESSAGE = "LOG_NO_SUCH_MESSAGE";
 extern const isc::log::MessageID LOG_OPEN_OUTPUT_FAIL = "LOG_OPEN_OUTPUT_FAIL";
 extern const isc::log::MessageID LOG_PREFIX_EXTRA_ARGS = "LOG_PREFIX_EXTRA_ARGS";
 extern const isc::log::MessageID LOG_PREFIX_INVALID_ARG = "LOG_PREFIX_INVALID_ARG";
@@ -37,16 +37,16 @@ const char* values[] = {
     "LOG_BAD_DESTINATION", "unrecognized log destination: %1",
     "LOG_BAD_SEVERITY", "unrecognized log severity: %1",
     "LOG_BAD_STREAM", "bad log console output stream: %1",
-    "LOG_DUPLICATE_NAMESPACE", "line %1: duplicate $NAMESPACE directive found",
     "LOG_DUPLICATE_MESSAGE_ID", "duplicate message ID (%1) in compiled code",
-    "LOG_NO_SUCH_MESSAGE", "could not replace message text for '%1': no such message",
+    "LOG_DUPLICATE_NAMESPACE", "line %1: duplicate $NAMESPACE directive found",
+    "LOG_INPUT_OPEN_FAIL", "unable to open message file %1 for input: %2",
     "LOG_INVALID_MESSAGE_ID", "line %1: invalid message identification '%2'",
-    "LOG_NO_MESSAGE_ID", "line %1: message definition line found without a message ID",
-    "LOG_NO_MESSAGE_TEXT", "line %1: line found containing a message ID ('%2') and no text",
     "LOG_NAMESPACE_EXTRA_ARGS", "line %1: $NAMESPACE directive has too many arguments",
     "LOG_NAMESPACE_INVALID_ARG", "line %1: $NAMESPACE directive has an invalid argument ('%2')",
     "LOG_NAMESPACE_NO_ARGS", "line %1: no arguments were given to the $NAMESPACE directive",
-    "LOG_INPUT_OPEN_FAIL", "unable to open message file %1 for input: %2",
+    "LOG_NO_MESSAGE_ID", "line %1: message definition line found without a message ID",
+    "LOG_NO_MESSAGE_TEXT", "line %1: line found containing a message ID ('%2') and no text",
+    "LOG_NO_SUCH_MESSAGE", "could not replace message text for '%1': no such message",
     "LOG_OPEN_OUTPUT_FAIL", "unable to open %1 for output: %2",
     "LOG_PREFIX_EXTRA_ARGS", "line %1: $PREFIX directive has too many arguments",
     "LOG_PREFIX_INVALID_ARG", "line %1: $PREFIX directive has an invalid argument ('%2')",

src/lib/log/log_messages.h

@@ -1,4 +1,4 @@
-// File created from log_messages.mes on Wed Jun 22 10:38:51 2011
+// File created from log_messages.mes on Wed Jun 22 11:54:57 2011
 
 #ifndef __LOG_MESSAGES_H
 #define __LOG_MESSAGES_H
@@ -11,16 +11,16 @@ namespace log {
 extern const isc::log::MessageID LOG_BAD_DESTINATION;
 extern const isc::log::MessageID LOG_BAD_SEVERITY;
 extern const isc::log::MessageID LOG_BAD_STREAM;
-extern const isc::log::MessageID LOG_DUPLICATE_NAMESPACE;
 extern const isc::log::MessageID LOG_DUPLICATE_MESSAGE_ID;
-extern const isc::log::MessageID LOG_NO_SUCH_MESSAGE;
+extern const isc::log::MessageID LOG_DUPLICATE_NAMESPACE;
+extern const isc::log::MessageID LOG_INPUT_OPEN_FAIL;
 extern const isc::log::MessageID LOG_INVALID_MESSAGE_ID;
-extern const isc::log::MessageID LOG_NO_MESSAGE_ID;
-extern const isc::log::MessageID LOG_NO_MESSAGE_TEXT;
 extern const isc::log::MessageID LOG_NAMESPACE_EXTRA_ARGS;
 extern const isc::log::MessageID LOG_NAMESPACE_INVALID_ARG;
 extern const isc::log::MessageID LOG_NAMESPACE_NO_ARGS;
-extern const isc::log::MessageID LOG_INPUT_OPEN_FAIL;
+extern const isc::log::MessageID LOG_NO_MESSAGE_ID;
+extern const isc::log::MessageID LOG_NO_MESSAGE_TEXT;
+extern const isc::log::MessageID LOG_NO_SUCH_MESSAGE;
 extern const isc::log::MessageID LOG_OPEN_OUTPUT_FAIL;
 extern const isc::log::MessageID LOG_PREFIX_EXTRA_ARGS;
 extern const isc::log::MessageID LOG_PREFIX_INVALID_ARG;

src/lib/log/log_messages.mes

@@ -22,7 +22,19 @@
 
 $NAMESPACE isc::log
 
-% LOG_DUPLICATE_MESSAGE_ID      duplicate message ID (%1) in compiled code
+% LOG_BAD_DESTINATION unrecognized log destination: %1
+A logger destination value was given that was not recognized. The
+destination should be one of "console", "file", or "syslog".
+
+% LOG_BAD_SEVERITY unrecognized log severity: %1
+A logger severity value was given that was not recognized. The severity
+should be one of "DEBUG", "INFO", "WARN", "ERROR", or "FATAL".
+
+% LOG_BAD_STREAM bad log console output stream: %1
+A log console output stream was given that was not recognized. The
+output stream should be one of "stdout", or "stderr"
+
+% LOG_DUPLICATE_MESSAGE_ID duplicate message ID (%1) in compiled code
 Indicative of a programming error, when it started up, BIND10 detected that
 the given message ID had been registered by one or more modules.  (All message
 IDs should be unique throughout BIND10.)  This has no impact on the operation
@@ -33,98 +45,86 @@ particular message, the text supplied by the module that added the original
 ID will be output - something that may bear no relation to the condition being
 logged.
 
-% LOG_DUPLICATE_NAMESPACE        line %1: duplicate $NAMESPACE directive found
+% LOG_DUPLICATE_NAMESPACE line %1: duplicate $NAMESPACE directive found
 When reading a message file, more than one $NAMESPACE directive was found.  In
 this version of the code, such a condition is regarded as an error and the
 read will be abandoned.
 
-% LOG_NO_SUCH_MESSAGE      could not replace message text for '%1': no such message
-During start-up a local message file was read.  A line with the listed
-message identification was found in the file, but the identification is not
-one contained in the compiled-in message dictionary.  Either the message
-identification has been mis-spelled in the file, or the local file was used
-for an earlier version of the software and the message with that
-identification has been removed.
-
-This message may appear a number of times in the file, once for every such
-unknown message identification.
+% LOG_INPUT_OPEN_FAIL unable to open message file %1 for input: %2
+The program was not able to open the specified input message file for the
+reason given.
 
-% LOG_INVALID_MESSAGE_ID      line %1: invalid message identification '%2'
+% LOG_INVALID_MESSAGE_ID line %1: invalid message identification '%2'
 The concatenation of the prefix and the message identification is used as
 a symbol in the C++ module; as such it may only contain 
 
-% LOG_NO_MESSAGE_ID       line %1: message definition line found without a message ID
-Message definition lines are lines starting with a "%".  The rest of the line
-should comprise the message ID and text describing the message.  This error
-indicates the message compiler found a line in the message file comprising
-just the "%" and nothing else.
-
-% LOG_NO_MESSAGE_TEXT      line %1: line found containing a message ID ('%2') and no text
-Message definition lines are lines starting with a "%".  The rest of the line
-should comprise the message ID and text describing the message.  This error
-is generated when a line is found in the message file that contains the
-leading "%" and the message identification but no text.
-
-% LOG_NAMESPACE_EXTRA_ARGS     line %1: $NAMESPACE directive has too many arguments
+% LOG_NAMESPACE_EXTRA_ARGS line %1: $NAMESPACE directive has too many arguments
 The $NAMESPACE directive takes a single argument, a namespace in which all the
 generated symbol names are placed.  This error is generated when the
 compiler finds a $NAMESPACE directive with more than one argument.
 
-% LOG_NAMESPACE_INVALID_ARG      line %1: $NAMESPACE directive has an invalid argument ('%2')
+% LOG_NAMESPACE_INVALID_ARG line %1: $NAMESPACE directive has an invalid argument ('%2')
 The $NAMESPACE argument should be a valid C++ namespace.  The reader does a
 cursory check on its validity, checking that the characters in the namespace
 are correct.  The error is generated when the reader finds an invalid
 character. (Valid are alphanumeric characters, underscores and colons.)
 
-% LOG_NAMESPACE_NO_ARGS       line %1: no arguments were given to the $NAMESPACE directive
+% LOG_NAMESPACE_NO_ARGS line %1: no arguments were given to the $NAMESPACE directive
 The $NAMESPACE directive takes a single argument, a namespace in which all the
 generated symbol names are placed.  This error is generated when the
 compiler finds a $NAMESPACE directive with no arguments.
 
-% LOG_INPUT_OPEN_FAIL        unable to open message file %1 for input: %2
-The program was not able to open the specified input message file for the
-reason given.
+% LOG_NO_MESSAGE_ID line %1: message definition line found without a message ID
+Message definition lines are lines starting with a "%".  The rest of the line
+should comprise the message ID and text describing the message.  This error
+indicates the message compiler found a line in the message file comprising
+just the "%" and nothing else.
+
+% LOG_NO_MESSAGE_TEXT line %1: line found containing a message ID ('%2') and no text
+Message definition lines are lines starting with a "%".  The rest of the line
+should comprise the message ID and text describing the message.  This error
+is generated when a line is found in the message file that contains the
+leading "%" and the message identification but no text.
 
-% LOG_OPEN_OUTPUT_FAIL       unable to open %1 for output: %2
+% LOG_NO_SUCH_MESSAGE could not replace message text for '%1': no such message
+During start-up a local message file was read.  A line with the listed
+message identification was found in the file, but the identification is not
+one contained in the compiled-in message dictionary.  Either the message
+identification has been mis-spelled in the file, or the local file was used
+for an earlier version of the software and the message with that
+identification has been removed.
+
+This message may appear a number of times in the file, once for every such
+unknown message identification.
+
+% LOG_OPEN_OUTPUT_FAIL unable to open %1 for output: %2
 The program was not able to open the specified output file for the reason
 given.
 
-% LOG_PREFIX_EXTRA_ARGS    line %1: $PREFIX directive has too many arguments
+% LOG_PREFIX_EXTRA_ARGS line %1: $PREFIX directive has too many arguments
 The $PREFIX directive takes a single argument, a prefix to be added to the
 symbol names when a C++ .h file is created.  This error is generated when the
 compiler finds a $PREFIX directive with more than one argument.
 
-% LOG_PREFIX_INVALID_ARG     line %1: $PREFIX directive has an invalid argument ('%2')
+% LOG_PREFIX_INVALID_ARG line %1: $PREFIX directive has an invalid argument ('%2')
 The $PREFIX argument is used in a symbol name in a C++ header file.  As such,
 it must adhere to restrictions on C++ symbol names (e.g. may only contain
 alphanumeric characters or underscores, and may nor start with a digit).
 A $PREFIX directive was found with an argument (given in the message) that
 violates those restictions.
 
-% LOG_READING_LOCAL_FILE      reading local message file %1
+% LOG_READING_LOCAL_FILE reading local message file %1
 This is an informational message output by BIND10 when it starts to read a
 local message file.  (A local message file may replace the text of one of more
 messages; the ID of the message will not be changed though.)
 
-% LOG_READ_ERROR       error reading from message file %1: %2
+% LOG_READ_ERROR error reading from message file %1: %2
 The specified error was encountered reading from the named message file.
 
-% LOG_WRITE_ERROR       error writing to %1: %2
-The specified error was encountered by the message compiler when writing to
-the named output file.
-
-% LOG_UNRECOGNISED_DIRECTIVE      line %1: unrecognised directive '%2'
+% LOG_UNRECOGNISED_DIRECTIVE line %1: unrecognised directive '%2'
 A line starting with a dollar symbol was found, but the first word on the line
 (shown in the message) was not a recognised message compiler directive.
 
-% LOG_BAD_SEVERITY   unrecognized log severity: %1
-A logger severity value was given that was not recognized. The severity
-should be one of "DEBUG", "INFO", "WARN", "ERROR", or "FATAL".
-
-% LOG_BAD_DESTINATION unrecognized log destination: %1
-A logger destination value was given that was not recognized. The
-destination should be one of "console", "file", or "syslog".
-
-% LOG_BAD_STREAM     bad log console output stream: %1
-A log console output stream was given that was not recognized. The
-output stream should be one of "stdout", or "stderr"
+% LOG_WRITE_ERROR error writing to %1: %2
+The specified error was encountered by the message compiler when writing to
+the named output file.