From f791c1b710e01cd627c113e244085de5f4ce5927 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sat, 19 Jul 2014 13:36:52 +0000 Subject: [PATCH] Move comment from .c to .h in order to make use of it in doxygen. Fix the comment that states that these vars are NULL on ASCII machine, they seem to be undefined instead. Rework some comments. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1611916 13f79535-47bb-0310-9956-ffa450edef68 --- include/util_charset.h | 30 ++++++++++++++++++++++-------- server/util_charset.c | 14 -------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/util_charset.h b/include/util_charset.h index 677b7dce9b..9df000d795 100644 --- a/include/util_charset.h +++ b/include/util_charset.h @@ -20,6 +20,16 @@ * * @defgroup APACHE_CORE_CHARSET Charset Conversion * @ingroup APACHE_CORE + * + * These are the translation handles used to translate between the network + * format of protocol headers and the local machine format. + * + * For an EBCDIC machine, these are valid handles which are set up at + * initialization to translate between ISO-8859-1 and the code page of + * the source code.\n + * For an ASCII machine, they are undefined. + * + * @see ap_init_ebcdic() * @{ */ @@ -36,16 +46,20 @@ extern "C" { #include "apr_xlate.h" -/** On EBCDIC machine this is a translation handle used to translate the - * headers from the local machine format to ASCII for network transmission. - * - * On an ASCII machine this is not defined. */ +/** + * On EBCDIC machine this is a translation handle used to translate the + * headers from the local machine format to ASCII for network transmission. + * @note On ASCII system, this variable does not exist. + * So, its use should be guarded by \#if APR_CHARSET_EBCDIC. + */ extern apr_xlate_t *ap_hdrs_to_ascii; -/** On EBCDIC machine this is a translation handle used to translate the - * headers from ASCII to the local machine format after network transmission. - * - * On an ASCII machine this is not defined. */ +/** + * On EBCDIC machine this is a translation handle used to translate the + * headers from ASCII to the local machine format after network transmission. + * @note On ASCII system, this variable does not exist. + * So, its use should be guarded by \#if APR_CHARSET_EBCDIC. + */ extern apr_xlate_t *ap_hdrs_from_ascii; #endif /* APR_CHARSET_EBCDIC */ diff --git a/server/util_charset.c b/server/util_charset.c index 514e0b43f3..f896729a59 100644 --- a/server/util_charset.c +++ b/server/util_charset.c @@ -23,20 +23,6 @@ #include "http_core.h" #include "util_charset.h" -/* ap_hdrs_to_ascii, ap_hdrs_from_ascii - * - * These are the translation handles used to translate between the network - * format of protocol headers and the local machine format. - * - * For an EBCDIC machine, these are valid handles which are set up at - * initialization to translate between ISO-8859-1 and the code page of - * the source code. - * - * For an ASCII machine, these remain NULL so that when they are stored - * in the BUFF via ap_bsetop(BO_RXLATE) it ensures that no translation is - * performed. - */ - apr_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii; #endif /*APR_CHARSET_EBCDIC */ -- 2.40.0