apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1039387 - in /apr/apr-util/branches/1.5.x: ./ buckets/apr_brigade.c include/apr_buckets.h include/apr_ldap.h.in include/apr_memcache.h include/apr_xml.h misc/apr_queue.c xml/expat/
Date Fri, 26 Nov 2010 14:39:40 GMT
Author: rjung
Date: Fri Nov 26 14:39:40 2010
New Revision: 1039387

URL: http://svn.apache.org/viewvc?rev=1039387&view=rev
Log:
Fixes various doxygen usage warnings and minor doxygen errors.
Port of r896410 from 1.3.x to 1.5.x.
Submitted by: Neil Conway <nrc@cs.berkeley.edu>

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.5.x/include/apr_buckets.h
    apr/apr-util/branches/1.5.x/include/apr_ldap.h.in
    apr/apr-util/branches/1.5.x/include/apr_memcache.h
    apr/apr-util/branches/1.5.x/include/apr_xml.h
    apr/apr-util/branches/1.5.x/misc/apr_queue.c   (props changed)
    apr/apr-util/branches/1.5.x/xml/expat/   (props changed)

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:39:40 2010
@@ -1,2 +1,3 @@
 /apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838
+/apr/apr-util/branches/1.3.x:896410
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.5.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:39:40 2010
@@ -1,2 +1,3 @@
 /apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508,917837-917838
+/apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:896410
 /apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.5.x/include/apr_buckets.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apr_buckets.h?rev=1039387&r1=1039386&r2=1039387&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/include/apr_buckets.h (original)
+++ apr/apr-util/branches/1.5.x/include/apr_buckets.h Fri Nov 26 14:39:40 2010
@@ -679,10 +679,11 @@ APU_DECLARE(apr_status_t) apr_brigade_de
 APU_DECLARE(apr_status_t) apr_brigade_cleanup(void *data);
 
 /**
- * Move the buckets from the tail end of the existing brigade @param b into
- * the brigade @param a. If @param a is NULL a new brigade is created. Buckets
- * from @param e to the last bucket (inclusively) of brigade @param b are moved
- * from @param b to the returned brigade @param a.
+ * Move the buckets from the tail end of the existing brigade @a b into
+ * the brigade @a a. If @a a is NULL a new brigade is created. Buckets
+ * from @a e to the last bucket (inclusively) of brigade @a b are moved
+ * from @a b to the returned brigade @a a.
+ *
  * @param b The brigade to split
  * @param e The first bucket to move
  * @param a The brigade which should be used for the result or NULL if
@@ -774,7 +775,7 @@ APU_DECLARE(apr_status_t) apr_brigade_sp
                                                  apr_off_t maxbytes);
 
 /**
- * create an iovec of the elements in a bucket_brigade... return number 
+ * Create an iovec of the elements in a bucket_brigade... return number 
  * of elements used.  This is useful for writing to a file or to the
  * network efficiently.
  * @param b The bucket brigade to create the iovec from

Modified: apr/apr-util/branches/1.5.x/include/apr_ldap.h.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apr_ldap.h.in?rev=1039387&r1=1039386&r2=1039387&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/include/apr_ldap.h.in (original)
+++ apr/apr-util/branches/1.5.x/include/apr_ldap.h.in Fri Nov 26 14:39:40 2010
@@ -192,6 +192,6 @@ typedef struct apr_ldap_err_t {
 #include "apr_ldap_option.h"
 #include "apr_ldap_rebind.h"
 
-/** @} */
 #endif /* APR_HAS_LDAP */
+/** @} */
 #endif /* APU_LDAP_H */

Modified: apr/apr-util/branches/1.5.x/include/apr_memcache.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apr_memcache.h?rev=1039387&r1=1039386&r2=1039387&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/include/apr_memcache.h (original)
+++ apr/apr-util/branches/1.5.x/include/apr_memcache.h Fri Nov 26 14:39:40 2010
@@ -120,6 +120,7 @@ typedef struct
 
 /**
  * Creates a crc32 hash used to split keys between servers
+ * @param mc The memcache client object to use
  * @param data Data to be hashed
  * @param data_len Length of the data to use
  * @return crc32 hash of data
@@ -163,7 +164,7 @@ APU_DECLARE(apr_memcache_server_t *) apr
 /**
  * Adds a server to a client object
  * @param mc The memcache client object to use
- * @param ms Server to add
+ * @param server Server to add
  * @remark Adding servers is not thread safe, and should be done once at startup.
  * @warning Changing servers after startup may cause keys to go to
  * different servers.
@@ -283,7 +284,7 @@ APU_DECLARE(apr_status_t) apr_memcache_m
  * @param mc client to use
  * @param key   null terminated string containing the key
  * @param baton data to store on the server
- * @param len   length of data at baton
+ * @param data_size   length of data at baton
  * @param timeout time in seconds for the data to live on the server
  * @param flags any flags set by the client for this key
  */
@@ -299,7 +300,7 @@ APU_DECLARE(apr_status_t) apr_memcache_s
  * @param mc client to use
  * @param key   null terminated string containing the key
  * @param baton data to store on the server
- * @param len   length of data at baton
+ * @param data_size   length of data at baton
  * @param timeout time for the data to live on the server
  * @param flags any flags set by the client for this key
  * @return APR_SUCCESS if the key was added, APR_EEXIST if the key 
@@ -317,7 +318,7 @@ APU_DECLARE(apr_status_t) apr_memcache_a
  * @param mc client to use
  * @param key   null terminated string containing the key
  * @param baton data to store on the server
- * @param len   length of data at baton
+ * @param data_size   length of data at baton
  * @param timeout time for the data to live on the server
  * @param flags any flags set by the client for this key
  * @return APR_SUCCESS if the key was added, APR_EEXIST if the key 
@@ -325,7 +326,7 @@ APU_DECLARE(apr_status_t) apr_memcache_a
  */
 APU_DECLARE(apr_status_t) apr_memcache_replace(apr_memcache_t *mc,
                                                const char *key,
-                                               char *data,
+                                               char *baton,
                                                const apr_size_t data_size,
                                                apr_uint32_t timeout,
                                                apr_uint16_t flags);
@@ -356,7 +357,7 @@ APU_DECLARE(apr_status_t) apr_memcache_i
  * @param mc client to use
  * @param key   null terminated string containing the key
  * @param n     number to decrement by
- * @param nv    new value after decrementing
+ * @param new_value    new value after decrementing
  */
 APU_DECLARE(apr_status_t) apr_memcache_decr(apr_memcache_t *mc, 
                                             const char *key,

Modified: apr/apr-util/branches/1.5.x/include/apr_xml.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apr_xml.h?rev=1039387&r1=1039386&r2=1039387&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/include/apr_xml.h (original)
+++ apr/apr-util/branches/1.5.x/include/apr_xml.h Fri Nov 26 14:39:40 2010
@@ -304,10 +304,10 @@ APU_DECLARE(const char *) apr_xml_empty_
 
 /**
  * quote an XML string
- * Replace '<', '>', and '&' with '&lt;', '&gt;', and '&amp;'.
+ * Replace '\<', '\>', and '\&' with '\&lt;', '\&gt;', and '\&amp;'.
  * @param p The pool to allocate out of
  * @param s The string to quote
- * @param quotes If quotes is true, then replace '"' with '&quot;'.
+ * @param quotes If quotes is true, then replace '&quot;' with '\&quot;'.
  * @return The quoted string
  * @note If the string does not contain special characters, it is not
  * duplicated into the pool and the original string is returned.

Propchange: apr/apr-util/branches/1.5.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:39:40 2010
@@ -1,3 +1,4 @@
 /apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508,917837-917838
 /apr/apr/trunk/util-misc/apr_queue.c:784520
+/apr/apr-util/branches/1.3.x/misc/apr_queue.c:896410
 /apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.5.x/xml/expat/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:39:40 2010
@@ -1,2 +1,3 @@
+/apr/apr-util/branches/1.3.x/xml/expat:896410
 /apr/apr-util/vendor/expat/1.95.7:1002560-1002564
 /apr/apr-util/vendor/expat/current:1002513-1002559



Mime
View raw message