apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1593613 - in /apr/apr/branches/1.5.x: ./ misc/unix/errorcodes.c
Date Fri, 09 May 2014 20:01:43 GMT
Author: sf
Date: Fri May  9 20:01:43 2014
New Revision: 1593613

URL: http://svn.apache.org/r1593613
Log:
Backport r1593612 from 1.6:
Backport r1593611 from trunk:

    Add some missing error messages to apr_error_string


Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/misc/unix/errorcodes.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1593611
  Merged /apr/apr/branches/1.6.x:r1593612

Modified: apr/apr/branches/1.5.x/misc/unix/errorcodes.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/misc/unix/errorcodes.c?rev=1593613&r1=1593612&r2=1593613&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/misc/unix/errorcodes.c (original)
+++ apr/apr/branches/1.5.x/misc/unix/errorcodes.c Fri May  9 20:01:43 2014
@@ -39,6 +39,8 @@ static char *stuffbuffer(char *buf, apr_
 static char *apr_error_string(apr_status_t statcode)
 {
     switch (statcode) {
+    case APR_ENOSTAT:
+        return "Could not perform a stat on the file.";
     case APR_ENOPOOL:
         return "A new pool could not be created.";
     case APR_EBADDATE:
@@ -73,7 +75,10 @@ static char *apr_error_string(apr_status
         return "The specified IP address is invalid.";
     case APR_EBADMASK:
         return "The specified network mask is invalid.";
-
+    case APR_ESYMNOTFOUND:
+        return "Could not find the requested symbol.";
+    case APR_ENOTENOUGHENTROPY:
+        return "Not enough entropy to continue.";
     case APR_INCHILD:
         return
 	    "Your code just forked, and you are currently executing in the "
@@ -128,10 +133,12 @@ static char *apr_error_string(apr_status
         return "The given path is misformatted or contained invalid characters";
     case APR_EPATHWILD:
         return "The given path contained wildcard characters";
+    case APR_EBUSY:
+        return "The given lock was busy.";
     case APR_EPROC_UNKNOWN:
         return "The process is not recognized.";
     case APR_EGENERAL:
-        return "Internal error";
+        return "Internal error (specific information not available)";
     default:
         return "Error string not specified yet";
     }



Mime
View raw message