You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2004/02/21 01:43:56 UTC
cvs commit: apr-util/uri apr_uri.c
gstein 2004/02/20 16:43:56
Modified: . Makefile.in buildconf
include/private .cvsignore
uri apr_uri.c
Removed: build gen-uri-delims.py
Log:
Stop generating the delimiter table. We only have two of them: one for
EBCDIC, and one for ASCII. Just encode those directly into apr_uri.c.
* Makefile.in:
(EXTRACLEAN_TARGETS): no longer reference uri/uri_delims.h
* buildconf:
- stop calling build/gen-uri-delims.py
* include/private/.cvsignore:
- remove old reference to uri_delims.h
* uri/apr_uri.c:
(uri_delims[]): insert two copies of this table. reformatted a bit from
the old table (each row is sixteen entries now, for easy hex mapping).
select the table based on APR_CHARSET_EBCDIC.
* build/gen-uri-delims.py: removed
Revision Changes Path
1.84 +1 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -u -r1.83 -r1.84
--- Makefile.in 17 Feb 2004 08:13:40 -0000 1.83
+++ Makefile.in 21 Feb 2004 00:43:56 -0000 1.84
@@ -32,7 +32,7 @@
include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \
export_vars.sh apu-config build/rules.mk include/apu_want.h
EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
- exports.c export_vars.h uri/uri_delims.h build-outputs.mk \
+ exports.c export_vars.h build-outputs.mk \
build/apr_common.m4 build/find_apr.m4 build/install.sh \
build/config.guess build/config.sub
1.12 +0 -7 apr-util/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/apr-util/buildconf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- buildconf 5 Feb 2004 10:16:25 -0000 1.11
+++ buildconf 21 Feb 2004 00:43:56 -0000 1.12
@@ -59,13 +59,6 @@
fi
#
-# Generate the URI delimiter table
-#
-### this is so stupidly static, that I'm not sure why we generate it...
-echo "Generating uri_delims.h ..."
-build/gen-uri-delims.py > uri/uri_delims.h
-
-#
# Generate build-outputs.mk for the build systme
#
echo "Generating 'make' outputs ..."
1.6 +0 -1 apr-util/include/private/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr-util/include/private/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- .cvsignore 10 Jul 2001 04:53:17 -0000 1.5
+++ .cvsignore 21 Feb 2004 00:43:56 -0000 1.6
@@ -2,4 +2,3 @@
apu_config.h
apu_select_dbm.h
apu_private.h
-uri_delims.h
1.20 +42 -2 apr-util/uri/apr_uri.c
Index: apr_uri.c
===================================================================
RCS file: /home/cvs/apr-util/uri/apr_uri.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- apr_uri.c 13 Feb 2004 09:55:27 -0000 1.19
+++ apr_uri.c 21 Feb 2004 00:43:56 -0000 1.20
@@ -188,8 +188,48 @@
#define T_HASH 0x08 /* '#' */
#define T_NUL 0x80 /* '\0' */
-/* the uri_delims.h file is autogenerated by gen_uri_delims.c */
-#include "uri_delims.h"
+#if APR_CHARSET_EBCDIC
+/* Delimiter table for the EBCDIC character set */
+static const unsigned char uri_delims[256] = {
+ T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,T_SLASH,0,0,0,0,0,0,0,0,0,0,0,0,0,T_QUESTION,
+ 0,0,0,0,0,0,0,0,0,0,T_COLON,T_HASH,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+#else
+/* Delimiter table for the ASCII character set */
+static const unsigned char uri_delims[256] = {
+ T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,T_HASH,0,0,0,0,0,0,0,0,0,0,0,T_SLASH,
+ 0,0,0,0,0,0,0,0,0,0,T_COLON,0,0,0,0,T_QUESTION,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
+#endif
+
/* it works like this:
if (uri_delims[ch] & NOTEND_foobar) {