Updated error handling.

Author: interkosmos

src/dm_cgi.f90

@@ -304,10 +304,14 @@ subroutine dm_cgi_form(env, param)
         type(cgi_param_type), intent(out)   :: param !! CGI parameter type.
 
         character(len=:), allocatable :: content
+        integer                       :: rc
 
         if (env%content_type /= MIME_FORM) return
         if (env%content_length == 0) return
-        if (dm_cgi_content(env, content) /= E_NONE) return
+
+        rc = dm_cgi_content(env, content)
+        if (dm_is_error(rc)) return
+
         call dm_cgi_parse(content, param)
     end subroutine dm_cgi_form
 
@@ -350,10 +354,12 @@ subroutine dm_cgi_parse(input, param)
         character(len=CGI_PARAM_LEN) :: pair(2)
         character(len=CGI_PARAM_LEN) :: pairs(CGI_MAX_PARAMS)
         character(len=len(input))    :: content
-        integer                      :: i, j, n
+        integer                      :: i, j, n, rc
 
         if (len_trim(input) == 0) return
-        if (dm_cgi_decode(input, content) /= E_NONE) return
+
+        rc = dm_cgi_decode(input, content)
+        if (dm_is_error(rc)) return
 
         n = dm_string_count_char(content, '&') + 1
         n = min(n, CGI_MAX_PARAMS)
@@ -465,7 +471,7 @@ integer function cgi_get_logical(param, key, value, default, required) result(rc
 
         rc = E_TYPE
         call dm_string_to(param%values(loc), i, stat)
-        if (stat /= E_NONE) return
+        if (dm_is_error(stat)) return
         value = (i /= 0)
         rc = E_NONE
     end function cgi_get_logical

src/dm_env.f90

@@ -8,7 +8,7 @@ module dm_env
     implicit none (type, external)
     private
 
-    integer, parameter :: ENV_BUFFER_LEN = 2048 !! Read buffer length.
+    integer, parameter :: ENV_BUFFER_LEN = 2048 !! Input buffer length.
 
     interface dm_env_get
         !! Generic environment variable access.
@@ -105,7 +105,7 @@ integer function env_get_int32(name, value, default, exists) result(rc)
         if (stat /= 0 .or. n == 0) return
         if (present(exists)) exists = .true.
         call dm_string_to(buffer, i, rc)
-        if (rc /= E_NONE) return
+        if (dm_is_error(rc)) return
 
         value = i
         rc    = E_NONE
@@ -133,7 +133,7 @@ integer function env_get_int64(name, value, default, exists) result(rc)
         if (stat /= 0 .or. n == 0) return
         if (present(exists)) exists = .true.
         call dm_string_to(buffer, i, rc)
-        if (rc /= E_NONE) return
+        if (dm_is_error(rc)) return
 
         value = i
         rc = E_NONE
@@ -156,7 +156,7 @@ integer function env_get_logical(name, value, default, exists) result(rc)
         if (present(exists))  exists = .false.
 
         rc = dm_env_get(name, i)
-        if (rc /= E_NONE) return
+        if (dm_is_error(rc)) return
         if (present(exists)) exists = .true.
 
         value = (i > 0)
@@ -185,7 +185,7 @@ integer function env_get_real32(name, value, default, exists) result(rc)
         if (stat /= 0 .or. n == 0) return
         if (present(exists)) exists = .true.
         call dm_string_to(buffer, f, rc)
-        if (rc /= E_NONE) return
+        if (dm_is_error(rc)) return
 
         value = f
         rc = E_NONE
@@ -213,7 +213,7 @@ integer function env_get_real64(name, value, default, exists) result(rc)
         if (stat /= 0 .or. n == 0) return
         if (present(exists)) exists = .true.
         call dm_string_to(buffer, f, rc)
-        if (rc /= E_NONE) return
+        if (dm_is_error(rc)) return
 
         value = f
         rc = E_NONE

src/dm_logger.f90

@@ -395,7 +395,7 @@ subroutine logger_out(this, log, unit)
 
         if (.not. this%no_color) call dm_ansi_color(LOGGER_COLORS(level))
 
-        if (log%error /= E_NONE) then
+        if (dm_is_error(log%error)) then
             write (unit_, FMT_ERROR) log%timestamp, &
                                      trim(LOG_LEVEL_NAMES(level)), &
                                      trim(log%source), &

src/dm_request.f90

@@ -647,10 +647,7 @@ pure elemental subroutine request_get_type(request, name, response, status, defa
         end block response_block
 
         if (present(status)) status = rc
-
-        if (present(default)) then
-            if (rc /= E_NONE) response = default
-        endif
+        if (present(default) .and. dm_is_error(rc)) response = default
     end subroutine request_get_type
 
     pure elemental subroutine request_set_int32(request, index, name, value, unit, error)