Author: danielsh
Date: Fri May 31 06:01:27 2013
New Revision: 1488101
URL: http://svn.apache.org/r1488101
Log:
Factor out a helper function. No functional change.
* build/generator/gen_base.py
(GeneratorBase.write_errno_table.write_struct): New helper function.
Modified:
subversion/trunk/build/generator/gen_base.py
Modified: subversion/trunk/build/generator/gen_base.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_base.py?rev=1488101&r1=1488100&r2=1488101&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_base.py (original)
+++ subversion/trunk/build/generator/gen_base.py Fri May 31 06:01:27 2013
@@ -252,23 +252,20 @@ class GeneratorBase:
fd = open('subversion/libsvn_subr/errorcode.inc', 'w')
fd.write('/* This file was generated by build/generator/gen_base.py
*/\n\n')
- ## write errno codes.
- fd.write('static struct {\n'
- ' int errcode;\n'
- ' const char *errname;\n'
- '} svn__errno[] = {\n');
- for num, val in sorted(errno.errorcode.items()):
- fd.write(' { %d, "%s" },\n' % (num, val))
- # fd.seek(-2, os.SEEK_CUR); fd.write('\n');
- fd.write('};\n')
+ def write_struct(name, codes):
+ fd.write('static struct {\n'
+ ' int errcode;\n'
+ ' const char *errname;\n'
+ '} %s[] = {\n' % name)
+ for num, val in sorted(codes):
+ fd.write(' { %d, "%s" },\n' % (num, val))
+ # fd.seek(-2, os.SEEK_CUR); fd.write('\n');
+ fd.write('};\n')
+ write_struct('svn__errno', errno.errorcode.items())
fd.write('\n')
- ## write apr error codes.
- fd.write('static struct {\n'
- ' int errcode;\n'
- ' const char *errname;\n'
- '} svn__apr_errno[] = {\n');
+ # Fetch and write apr_errno.h codes.
aprerr = []
for line in
open(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),
'tools', 'dev', 'aprerr.txt')):
@@ -277,10 +274,7 @@ class GeneratorBase:
continue
key, _, val = line.split()
aprerr += [(int(val), key)]
- for num, val in sorted(aprerr):
- fd.write(' { %d, "%s" },\n' % (num, val))
- # fd.seek(-2, os.SEEK_CUR); fd.write('\n');
- fd.write('};\n')
+ write_struct('svn__apr_errno', aprerr)
## sanity check
intersection = set(errno.errorcode.keys()) & set(dict(aprerr).keys())
