*** empty log message ***

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1855 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/AUTHORS b/AUTHORS
index 5775ecb..758f02f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
 Atsushi Konno <konn@users.sourceforge.jp>
+Makoto Nagai(namako) <>

diff --git a/configure b/configure
index 37cc85c..c6b68c4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mod_chxj 0.9.0.
+# Generated by GNU Autoconf 2.61 for mod_chxj 1.0.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mod_chxj'
 PACKAGE_TARNAME='mod_chxj'
-PACKAGE_VERSION='0.9.0'
-PACKAGE_STRING='mod_chxj 0.9.0'
+PACKAGE_VERSION='1.0.0'
+PACKAGE_STRING='mod_chxj 1.0.0'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/mod_chxj.c"
@@ -1402,7 +1402,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_chxj 0.9.0 to adapt to many kinds of systems.
+\`configure' configures mod_chxj 1.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1473,7 +1473,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_chxj 0.9.0:";;
+     short | recursive ) echo "Configuration of mod_chxj 1.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1581,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_chxj configure 0.9.0
+mod_chxj configure 1.0.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1595,7 +1595,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_chxj $as_me 0.9.0, which was
+It was created by mod_chxj $as_me 1.0.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2413,7 +2413,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=mod_chxj
- VERSION=0.9.0
+ VERSION=1.0.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22318,7 +22318,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mod_chxj $as_me 0.9.0, which was
+This file was extended by mod_chxj $as_me 1.0.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22371,7 +22371,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_chxj config.status 0.9.0
+mod_chxj config.status 1.0.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index c98ed4a..005e500 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([mod_chxj],[0.9.0])
+AC_INIT([mod_chxj],[1.0.0])
 AC_PREREQ(2.61)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET

diff --git a/include/chxj_chtml10.h b/include/chxj_chtml10.h
index 9b3985d..5859480 100644 (file)
--- a/include/chxj_chtml10.h
+++ b/include/chxj_chtml10.h
@@ -43,7 +43,7 @@ struct ctml10_t {
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_chtml10(
+extern char* chxj_convert_chtml10(
   request_rec*          r,
   device_table*         spec, 
   const char*           src, 

diff --git a/include/chxj_chtml20.h b/include/chxj_chtml20.h
index 45e1ff9..3f92c45 100644 (file)
--- a/include/chxj_chtml20.h
+++ b/include/chxj_chtml20.h
@@ -43,7 +43,7 @@ struct ctml20_t {
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_chtml20(
+extern char* chxj_convert_chtml20(
   request_rec*          r,
   device_table*         spec,
   const char*           src,

diff --git a/include/chxj_chtml30.h b/include/chxj_chtml30.h
index 685257d..1636c08 100644 (file)
--- a/include/chxj_chtml30.h
+++ b/include/chxj_chtml30.h
@@ -43,7 +43,7 @@ struct chtml30_t {
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_chtml30(
+extern char* chxj_convert_chtml30(
   request_rec*          r,
   device_table*         spec,
   const char*           src,

diff --git a/include/chxj_hdml.h b/include/chxj_hdml.h
index 90e8eff..c91e64e 100644 (file)
--- a/include/chxj_hdml.h
+++ b/include/chxj_hdml.h
@@ -101,7 +101,7 @@ struct hdml_t {
 /*============================================================================*/
 /* Prototype declaration.                                                     */
 /*============================================================================*/
-extern char* chxj_exchange_hdml(
+extern char* chxj_convert_hdml(
   request_rec*        r, 
   device_table*       spec,
   const char*         src,

diff --git a/include/chxj_jhtml.h b/include/chxj_jhtml.h
index a16ead2..66aed8d 100644 (file)
--- a/include/chxj_jhtml.h
+++ b/include/chxj_jhtml.h
@@ -43,7 +43,7 @@ struct jhtml_t {
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_jhtml(
+extern char* chxj_convert_jhtml(
   request_rec*              r,
   device_table*             spec,
   const char*               src,

diff --git a/include/chxj_xhtml_mobile_1_0.h b/include/chxj_xhtml_mobile_1_0.h
index 799dc9f..80f1421 100644 (file)
--- a/include/chxj_xhtml_mobile_1_0.h
+++ b/include/chxj_xhtml_mobile_1_0.h
@@ -40,7 +40,7 @@ struct xhtml_t {
 /*----------------------------------------------------------------------------*/
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
-extern char* chxj_exchange_xhtml_mobile_1_0(
+extern char* chxj_convert_xhtml_mobile_1_0(
   request_rec*          r,
   device_table*         spec,
   const char*           src,

diff --git a/include/config.h b/include/config.h
index 6ce9990..ef7388d 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -96,19 +96,19 @@
 #define PACKAGE_NAME "mod_chxj"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_chxj 0.9.0"
+#define PACKAGE_STRING "mod_chxj 1.0.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "mod_chxj"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.9.0"
+#define PACKAGE_VERSION "1.0.0"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.9.0"
+#define VERSION "1.0.0"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 764a850..826d803 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -395,7 +395,7 @@ extern tag_handler  xhtml_handler[];
 extern tag_handler  hdml_handler[];
 extern tag_handler  jhtml_handler[];
 
-extern char *chxj_node_exchange( 
+extern char *chxj_node_convert( 
   device_table *spec,
   request_rec  *r,
   void         *pdoc,

diff --git a/src/Makefile.am b/src/Makefile.am
index 2e7c2b9..1a9fe2b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
     chxj_calc_ecc.c \
     chxj_apply_convrule.c \
     chxj_encoding.c \
-    chxj_node_exchange.c \
+    chxj_node_convert.c \
     chxj_url_encode.c \
     chxj_cookie.c \
     chxj_preg_replace.c \

diff --git a/src/Makefile.in b/src/Makefile.in
index 7718c01..6abc01f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -70,7 +70,7 @@ am_libmod_chxj_la_OBJECTS = libmod_chxj_la-mod_chxj.lo \
        libmod_chxj_la-chxj_qr_code.lo libmod_chxj_la-chxj_calc_ecc.lo \
        libmod_chxj_la-chxj_apply_convrule.lo \
        libmod_chxj_la-chxj_encoding.lo \
-       libmod_chxj_la-chxj_node_exchange.lo \
+       libmod_chxj_la-chxj_node_convert.lo \
        libmod_chxj_la-chxj_url_encode.lo \
        libmod_chxj_la-chxj_cookie.lo \
        libmod_chxj_la-chxj_preg_replace.lo \
@@ -242,7 +242,7 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
     chxj_calc_ecc.c \
     chxj_apply_convrule.c \
     chxj_encoding.c \
-    chxj_node_exchange.c \
+    chxj_node_convert.c \
     chxj_url_encode.c \
     chxj_cookie.c \
     chxj_preg_replace.c \
@@ -335,7 +335,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_jhtml.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_load_device_data.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_load_emoji_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_node_convert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_preg_replace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_qr_code.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmod_chxj_la-chxj_specified_device.Plo@am__quote@
@@ -555,12 +555,12 @@ libmod_chxj_la-chxj_encoding.lo: chxj_encoding.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_encoding.lo `test -f 'chxj_encoding.c' || echo '$(srcdir)/'`chxj_encoding.c
 
-libmod_chxj_la-chxj_node_exchange.lo: chxj_node_exchange.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_node_exchange.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Tpo -c -o libmod_chxj_la-chxj_node_exchange.lo `test -f 'chxj_node_exchange.c' || echo '$(srcdir)/'`chxj_node_exchange.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Tpo $(DEPDIR)/libmod_chxj_la-chxj_node_exchange.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='chxj_node_exchange.c' object='libmod_chxj_la-chxj_node_exchange.lo' libtool=yes @AMDEPBACKSLASH@
+libmod_chxj_la-chxj_node_convert.lo: chxj_node_convert.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_node_convert.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_node_convert.Tpo -c -o libmod_chxj_la-chxj_node_convert.lo `test -f 'chxj_node_convert.c' || echo '$(srcdir)/'`chxj_node_convert.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libmod_chxj_la-chxj_node_convert.Tpo $(DEPDIR)/libmod_chxj_la-chxj_node_convert.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='chxj_node_convert.c' object='libmod_chxj_la-chxj_node_convert.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_node_exchange.lo `test -f 'chxj_node_exchange.c' || echo '$(srcdir)/'`chxj_node_exchange.c
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -c -o libmod_chxj_la-chxj_node_convert.lo `test -f 'chxj_node_convert.c' || echo '$(srcdir)/'`chxj_node_convert.c
 
 libmod_chxj_la-chxj_url_encode.lo: chxj_url_encode.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmod_chxj_la_CFLAGS) $(CFLAGS) -MT libmod_chxj_la-chxj_url_encode.lo -MD -MP -MF $(DEPDIR)/libmod_chxj_la-chxj_url_encode.Tpo -c -o libmod_chxj_la-chxj_url_encode.lo `test -f 'chxj_url_encode.c' || echo '$(srcdir)/'`chxj_url_encode.c