svn commit: r1307598 - in /subversion/trunk/tools/dev: aprerr.txt which-error.py

[da...@apache.org]

Author: danielsh
Date: Fri Mar 30 20:29:32 2012
New Revision: 1307598

URL: http://svn.apache.org/viewvc?rev=1307598&view=rev
Log:
Support APR errors in which-error.py:

    % ./which-error.py 70008
    00070008  APR_INCOMPLETE

Thanks to Daniel Gruno for providing aprerr.txt.

* tools/dev/aprerr.txt
    New file.  Generated by parsing apr_errno.h of APR 1.4.5.

* tools/dev/which-error.py
  (get_errors): Merge APR's error codes into the dict.

Added:
    subversion/trunk/tools/dev/aprerr.txt
Modified:
    subversion/trunk/tools/dev/which-error.py

Added: subversion/trunk/tools/dev/aprerr.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/aprerr.txt?rev=1307598&view=auto
==============================================================================
--- subversion/trunk/tools/dev/aprerr.txt (added)
+++ subversion/trunk/tools/dev/aprerr.txt Fri Mar 30 20:29:32 2012
@@ -0,0 +1,126 @@
+APR_SUCCESS = 0
+SOCBASEERR = 10000
+SOCEPERM = 10001
+SOCESRCH = 10003
+SOCEINTR = 10004
+SOCENXIO = 10006
+SOCEBADF = 10009
+SOCEACCES = 10013
+SOCEFAULT = 10014
+SOCEINVAL = 10022
+SOCEMFILE = 10024
+SOCEPIPE = 10032
+SOCEWOULDBLOCK = 10035
+SOCEINPROGRESS = 10036
+SOCEALREADY = 10037
+SOCENOTSOCK = 10038
+SOCEDESTADDRREQ = 10039
+SOCEMSGSIZE = 10040
+SOCEPROTOTYPE = 10041
+SOCENOPROTOOPT = 10042
+SOCEPROTONOSUPPORT = 10043
+SOCESOCKTNOSUPPORT = 10044
+SOCEOPNOTSUPP = 10045
+SOCEPFNOSUPPORT = 10046
+SOCEAFNOSUPPORT = 10047
+SOCEADDRINUSE = 10048
+SOCEADDRNOTAVAIL = 10049
+SOCENETDOWN = 10050
+SOCENETUNREACH = 10051
+SOCENETRESET = 10052
+SOCECONNABORTED = 10053
+SOCECONNRESET = 10054
+SOCENOBUFS = 10055
+SOCEISCONN = 10056
+SOCENOTCONN = 10057
+SOCESHUTDOWN = 10058
+SOCETOOMANYREFS = 10059
+SOCETIMEDOUT = 10060
+SOCECONNREFUSED = 10061
+SOCELOOP = 10062
+SOCENAMETOOLONG = 10063
+SOCEHOSTDOWN = 10064
+SOCEHOSTUNREACH = 10065
+SOCENOTEMPTY = 10066
+APR_UTIL_ERRSPACE_SIZE = 20000
+APR_OS_START_ERROR = 20000
+APR_ENOSTAT = 20001
+APR_ENOPOOL = 20002
+APR_EBADDATE = 20004
+APR_EINVALSOCK = 20005
+APR_ENOPROC = 20006
+APR_ENOTIME = 20007
+APR_ENODIR = 20008
+APR_ENOLOCK = 20009
+APR_ENOPOLL = 20010
+APR_ENOSOCKET = 20011
+APR_ENOTHREAD = 20012
+APR_ENOTHDKEY = 20013
+APR_EGENERAL = 20014
+APR_ENOSHMAVAIL = 20015
+APR_EBADIP = 20016
+APR_EBADMASK = 20017
+APR_EDSOOPEN = 20019
+APR_EABSOLUTE = 20020
+APR_ERELATIVE = 20021
+APR_EINCOMPLETE = 20022
+APR_EABOVEROOT = 20023
+APR_EBADPATH = 20024
+APR_EPATHWILD = 20025
+APR_ESYMNOTFOUND = 20026
+APR_EPROC_UNKNOWN = 20027
+APR_ENOTENOUGHENTROPY = 20028
+APR_OS_ERRSPACE_SIZE = 50000
+APR_OS_START_STATUS = 70000
+APR_INCHILD = 70001
+APR_INPARENT = 70002
+APR_DETACH = 70003
+APR_NOTDETACH = 70004
+APR_CHILD_DONE = 70005
+APR_CHILD_NOTDONE = 70006
+APR_TIMEUP = 70007
+APR_INCOMPLETE = 70008
+APR_BADCH = 70012
+APR_BADARG = 70013
+APR_EOF = 70014
+APR_NOTFOUND = 70015
+APR_ANONYMOUS = 70019
+APR_FILEBASED = 70020
+APR_KEYBASED = 70021
+APR_EINIT = 70022
+APR_ENOTIMPL = 70023
+APR_EMISMATCH = 70024
+APR_EBUSY = 70025
+APR_UTIL_START_STATUS = 100000
+APR_OS_START_USEERR = 120000
+APR_OS_START_USERERR = 120000
+APR_OS_START_CANONERR = 620000
+APR_EACCES = 620001
+APR_EEXIST = 620002
+APR_ENAMETOOLONG = 620003
+APR_ENOENT = 620004
+APR_ENOTDIR = 620005
+APR_ENOSPC = 620006
+APR_ENOMEM = 620007
+APR_EMFILE = 620008
+APR_ENFILE = 620009
+APR_EBADF = 620010
+APR_EINVAL = 620011
+APR_ESPIPE = 620012
+APR_EAGAIN = 620013
+APR_EINTR = 620014
+APR_ENOTSOCK = 620015
+APR_ECONNREFUSED = 620016
+APR_EINPROGRESS = 620017
+APR_ECONNABORTED = 620018
+APR_ECONNRESET = 620019
+APR_ETIMEDOUT = 620020
+APR_EHOSTUNREACH = 620021
+APR_ENETUNREACH = 620022
+APR_EFTYPE = 620023
+APR_EPIPE = 620024
+APR_EXDEV = 620025
+APR_ENOTEMPTY = 620026
+APR_EAFNOSUPPORT = 620027
+APR_OS_START_EAIERR = 670000
+APR_OS_START_SYSERR = 720000

Modified: subversion/trunk/tools/dev/which-error.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/which-error.py?rev=1307598&r1=1307597&r2=1307598&view=diff
==============================================================================
--- subversion/trunk/tools/dev/which-error.py (original)
+++ subversion/trunk/tools/dev/which-error.py Fri Mar 30 20:29:32 2012
@@ -69,7 +69,13 @@ codes.  This can be done in variety of w
 
 def get_errors():
   errs = {}
+  ## errno values.
   errs.update(errno.errorcode)
+  ## APR-defined errors, from apr_errno.h.
+  for line in open(os.path.join(os.path.dirname(sys.argv[0]), 'aprerr.txt')):
+    key, _, val = line.split()
+    errs[int(val)] = key
+  ## Subversion errors, from svn_error_codes.h.
   for key in vars(core):
     if key.find('SVN_ERR_') == 0:
       try: