Prefix all exception codes with `e_'.

* src/mfstat.awk: Look for mf_exception_code/mf_exception_count.
* src/lex.l (variable_or_const): Add type cast.
* src/mailfromd.h (enum mf_status_code): Retain only first four proper
status codes.
(enum mf_exception_code): New type.
(mf_status_to_exception): New macro
(mf_exception_str,string_to_exception): New functions
(mf_status_str): Rewrite as macro.
(string_to_stat): Remove.
* src/mf-status.mfi: Prefix codes with e_
* src/status.mfi: Prefix exception codes with e_. Retain
succes, not_found, failure, and temp_failure for backward
compatibility.
Retain old exception names if m4 symbol COMPAT_4_3 is defined.
* src/gram.y, src/snarf.m4, src/bi_poll.m4, src/bi_string.m4,
src/drivers.c, src/bi_dns.m4, src/bi_system.m4, src/bi_spf.m4,
src/prog.c, src/bi_ipaddr.m4, src/bi_sa.m4, src/bi_io.m4,
src/bi_sieve.m4, src/bi_vars.m4, src/bi_other.m4, src/bi_mail.m4,
src/bi_gettext.m4, src/bi_db.m4, : Use new exception names.
* configure.ac (MF_VERSION_PATCH): Set to 90
* doc/mailfromd.texi: Document changes.



git-svn-id: file:///svnroot/mailfromd/branches/release_4_3_patches@1628 7a8a7f39-df28-0410-adc6-e0d955640f24

26 files changed, 267 insertions, 214 deletions

diff --git a/ChangeLog b/ChangeLog
index 9abbf87e..66cdf707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 2008-03-09  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+        Prefix all exception codes with `e_'.
+        
+        * src/mfstat.awk: Look for mf_exception_code/mf_exception_count.
+        * src/lex.l (variable_or_const): Add type cast.
+        * src/mailfromd.h (enum mf_status_code): Retain only first four proper
+        status codes.
+        (enum mf_exception_code): New type.
+        (mf_status_to_exception): New macro
+        (mf_exception_str,string_to_exception): New functions
+        (mf_status_str): Rewrite as macro.
+        (string_to_stat): Remove.
+        * src/mf-status.mfi: Prefix codes with e_
+        * src/status.mfi: Prefix exception codes with e_. Retain
+        succes, not_found, failure, and temp_failure for backward
+        compatibility.
+        Retain old exception names if m4 symbol COMPAT_4_3 is defined.
+        * src/gram.y, src/snarf.m4, src/bi_poll.m4, src/bi_string.m4,
+        src/drivers.c, src/bi_dns.m4, src/bi_system.m4, src/bi_spf.m4,
+        src/prog.c, src/bi_ipaddr.m4, src/bi_sa.m4, src/bi_io.m4,
+        src/bi_sieve.m4, src/bi_vars.m4, src/bi_other.m4, src/bi_mail.m4,
+        src/bi_gettext.m4, src/bi_db.m4, : Use new exception names.
+        * configure.ac (MF_VERSION_PATCH): Set to 90
+        * doc/mailfromd.texi: Document changes.
+
         Name clashes between constants and variables went unnoticed by the
         compiler. Bug reported by Thomas Lynch.
         Fix this and rename exception codes to minimize chances of such
diff --git a/configure.ac b/configure.ac
index 6b55d68d..c76eae46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 AC_PREREQ(2.59)
 m4_define([MF_VERSION_MAJOR], 4)
 m4_define([MF_VERSION_MINOR], 3)
-m4_define([MF_VERSION_PATCH], 1)
+m4_define([MF_VERSION_PATCH], 90)
 AC_INIT([mailfromd],
         MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH),
         [bug-mailfromd@gnu.org.ua])
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index e4b456d1..27ff4c46 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -133,6 +133,7 @@ Sender Address Verification.
 
 Building the Package
 
+* 43x-440::  Upgrading from 4.3.x to 4.4
 * 420-43x::  Upgrading from 4.2 to 4.3.x
 * 410-420::  Upgrading from 4.1 to 4.2
 * 400-410::  Upgrading from 4.0 to 4.1
@@ -987,6 +988,7 @@ the corresponding section below.
 @end enumerate
 
 @menu
+* 43x-440::  Upgrading from 4.3.x to 4.4
 * 420-43x::  Upgrading from 4.2 to 4.3.x
 * 410-420::  Upgrading from 4.1 to 4.2
 * 400-410::  Upgrading from 4.0 to 4.1
@@ -996,6 +998,11 @@ the corresponding section below.
 * 1x-2x::    Upgrading from 1.x to 2.x
 @end menu
 
+@node 43x-440
+@section Upgrading from 4.3.x to 4.4
+@cindex Upgrading from 4.3.x to 4.4
+@UNREVISED{}
+
 @node 420-43x
 @section Upgrading from 4.2 to 4.3.x
 @cindex Upgrading from 4.2 to 4.3.x
@@ -3167,7 +3174,7 @@ done
 @end smallexample
 
   Another common case are undefined Sendmail macros.  In this case the
-@code{macroundef} exception is generated: 
+@code{e_macroundef} exception is generated: 
 
 @smallexample
 RUNTIME ERROR near foo.c:34: Macro not defined: @{client_adr@}
@@ -5386,7 +5393,7 @@ starting at @var{start}.  If @var{length} is omitted, the rest of
 @var{str} is used.
 
   If @var{length} is greater than the actual length of the string, the
-@code{range} exception is signalled.  
+@code{e_range} exception is signalled.  
 
 @smallexample
 substr("mailfrom", 4) @result{} "from"
@@ -5520,7 +5527,7 @@ supplied arguments match their corresponding conversion specifiers.
 By default, the arguments are used in the order given, where each
 @samp{*} and each conversion specifier asks for the next argument.  If
 insufficiently many arguments are given, @code{sprintf} raises
-@samp{range} exception.  One can also specify explicitly which
+@samp{e_range} exception.  One can also specify explicitly which
 argument is taken, at each place where an argument is required, by
 writing @samp{%@var{m}$}, instead of @samp{%} and @samp{*@var{m}$}
 instead of @samp{*}, where the decimal integer @var{m} denotes the
@@ -5657,7 +5664,7 @@ arguments:
 @end table
 
   If the function is unable to encode the string, it raises the
-exception @code{failure}.
+exception @code{e_failure}.
 
 For example:
 
@@ -5674,7 +5681,7 @@ message_header_encode(%string, "ISO-8859-1")
  (string @var{text}, [string @var{charset}])
   @var{text} must be a header value encoded in accordance with @acronym{RFC}
 2047.  The function returns the decoded string.  If the decoding fails,
-it raises @code{failure} exception.  The optional argument
+it raises @code{e_failure} exception.  The optional argument
 @var{charset} specifies the character set to use (default --
 @samp{UTF-8}).
 
@@ -5734,7 +5741,7 @@ using @var{domain} as @code{EHLO} domain and @var{mailfrom} as
 In contrast to @code{strictpoll} function, this function does not use
 cache database and does not fall back to polling @acronym{MX} servers if the
 main poll tempfails.  The function can throw one of the following
-exceptions: @code{failure}, @code{temp_failure}.
+exceptions: @code{e_failure}, @code{e_temp_failure}.
 @end deftypefn
 
 @deftypefn {Built-in Function} number _pollmx @
@@ -5746,7 +5753,7 @@ FROM} address.  Returns 0 or 1 depending on the result of the test.
 In contrast to @code{stdpoll} function, @code{_pollmx} does
 not use cache database and does not fall back to polling the @var{ip} 
 if the poll fails.  The function can throw one of the following
-exceptions: @code{failure}, @code{temp_failure}.
+exceptions: @code{e_failure}, @code{e_temp_failure}.
 @end deftypefn
 
 @deftypefn {Built-in Function} number stdpoll @
@@ -5755,7 +5762,7 @@ exceptions: @code{failure}, @code{temp_failure}.
   Performs standard poll for @var{email}, using @var{domain} as
 @code{EHLO} domain and @var{mailfrom} as @code{MAIL FROM} address.
 Returns 0 or 1 depending on the result of the test.  Can raise one of
-the following exceptions: @code{failure}, @code{temp_failure}.
+the following exceptions: @code{e_failure}, @code{e_temp_failure}.
 
   In @code{on} statement context, it is synonymous to @code{poll}