httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1611916 - in /httpd/httpd/trunk: include/util_charset.h server/util_charset.c
Date Sat, 19 Jul 2014 13:36:53 GMT
Author: jailletc36
Date: Sat Jul 19 13:36:52 2014
New Revision: 1611916

URL: http://svn.apache.org/r1611916
Log:
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.

Modified:
    httpd/httpd/trunk/include/util_charset.h
    httpd/httpd/trunk/server/util_charset.c

Modified: httpd/httpd/trunk/include/util_charset.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_charset.h?rev=1611916&r1=1611915&r2=1611916&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_charset.h (original)
+++ httpd/httpd/trunk/include/util_charset.h Sat Jul 19 13:36:52 2014
@@ -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 <b>not</b> 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 <b>not</b> exist.
+ * So, its use should be guarded by \#if APR_CHARSET_EBCDIC.
+ */
 extern apr_xlate_t *ap_hdrs_from_ascii;
 
 #endif  /* APR_CHARSET_EBCDIC */

Modified: httpd/httpd/trunk/server/util_charset.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_charset.c?rev=1611916&r1=1611915&r2=1611916&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_charset.c (original)
+++ httpd/httpd/trunk/server/util_charset.c Sat Jul 19 13:36:52 2014
@@ -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 */



Mime
View raw message