You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2016/05/30 19:58:14 UTC

svn commit: r1746184 - in /httpd/httpd/branches/2.4.x/modules/http2: h2_mplx.h h2_push.h h2_stream.h h2_util.h

Author: jailletc36
Date: Mon May 30 19:58:14 2016
New Revision: 1746184

URL: http://svn.apache.org/viewvc?rev=1746184&view=rev
Log:
Fix some obvious doxygen warning

Modified:
    httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_push.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h
    httpd/httpd/branches/2.4.x/modules/http2/h2_util.h

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.h?rev=1746184&r1=1746183&r2=1746184&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.h Mon May 30 19:58:14 2016
@@ -167,7 +167,7 @@ apr_uint32_t h2_mplx_shutdown(h2_mplx *m
  * Notifies mplx that a stream has finished processing.
  * 
  * @param m the mplx itself
- * @param stream_id the id of the stream being done
+ * @param stream the id of the stream being done
  * @param rst_error if != 0, the stream was reset with the error given
  *
  */
@@ -188,7 +188,7 @@ apr_status_t h2_mplx_out_trywait(h2_mplx
  * Process a stream request.
  * 
  * @param m the multiplexer
- * @param stream_id the identifier of the stream
+ * @param stream the identifier of the stream
  * @param r the request to be processed
  * @param cmp the stream priority compare function
  * @param ctx context data for the compare function

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_push.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_push.h?rev=1746184&r1=1746183&r2=1746184&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_push.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_push.h Mon May 30 19:58:14 2016
@@ -63,7 +63,7 @@ apr_array_header_t *h2_push_collect(apr_
 /**
  * Create a new push diary for the given maximum number of entries.
  * 
- * @oaram p the pool to use
+ * @param p the pool to use
  * @param N the max number of entries, rounded up to 2^x
  * @return the created diary, might be NULL of max_entries is 0
  */

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h?rev=1746184&r1=1746183&r2=1746184&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_stream.h Mon May 30 19:58:14 2016
@@ -103,7 +103,7 @@ void h2_stream_cleanup(h2_stream *stream
  * destruction to take the pool with it.
  *
  * @param stream the stream to detach the pool from
- * @param the detached memmory pool or NULL if stream no longer has one
+ * @result the detached memory pool or NULL if stream no longer has one
  */
 apr_pool_t *h2_stream_detach_pool(h2_stream *stream);
 
@@ -153,7 +153,7 @@ apr_status_t h2_stream_write_data(h2_str
  * @param stream the stream to reset
  * @param error_code the HTTP/2 error code
  */
-void h2_stream_rst(h2_stream *streamm, int error_code);
+void h2_stream_rst(h2_stream *stream, int error_code);
 
 /**
  * Schedule the stream for execution. All header information must be
@@ -182,7 +182,7 @@ struct h2_response *h2_stream_get_respon
  * the stream response has been collected.
  * 
  * @param stream the stream to set the response for
- * @param resonse the response data for the stream
+ * @param response the response data for the stream
  * @param bb bucket brigade with output data for the stream. Optional,
  *        may be incomplete.
  */

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_util.h?rev=1746184&r1=1746183&r2=1746184&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_util.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_util.h Mon May 30 19:58:14 2016
@@ -58,7 +58,7 @@ void *h2_ihash_get(h2_ihash_t *ih, int i
  * @param ih the hash to iterate over
  * @param fn the function to invoke on each member
  * @param ctx user supplied data passed into each iteration call
- * @param 0 if one iteration returned 0, otherwise != 0
+ * @return 0 if one iteration returned 0, otherwise != 0
  */
 int h2_ihash_iter(h2_ihash_t *ih, h2_ihash_iter_t *fn, void *ctx);
 
@@ -141,14 +141,14 @@ int h2_iq_empty(h2_iqueue *q);
 int h2_iq_count(h2_iqueue *q);
 
 /**
- * Add a stream idto the queue. 
+ * Add a stream id to the queue. 
  *
  * @param q the queue to append the task to
  * @param sid the stream id to add
  * @param cmp the comparator for sorting
  * @param ctx user data for comparator 
  */
-void h2_iq_add(h2_iqueue *q, int i, h2_iq_cmp *cmp, void *ctx);
+void h2_iq_add(h2_iqueue *q, int sid, h2_iq_cmp *cmp, void *ctx);
 
 /**
  * Remove the stream id from the queue. Return != 0 iff task
@@ -157,7 +157,7 @@ void h2_iq_add(h2_iqueue *q, int i, h2_i
  * @param sid the stream id to remove
  * @return != 0 iff task was found in queue
  */
-int h2_iq_remove(h2_iqueue *q, int i);
+int h2_iq_remove(h2_iqueue *q, int sid);
 
 /**
  * Remove all entries in the queue.
@@ -374,12 +374,12 @@ apr_size_t h2_util_bb_print(char *buffer
  * Logs the bucket brigade (which bucket types with what length)
  * to the log at the given level.
  * @param c the connection to log for
- * @param stream_id the stream identifier this brigade belongs to
+ * @param sid the stream identifier this brigade belongs to
  * @param level the log level (as in APLOG_*)
  * @param tag a short message text about the context
  * @param bb the brigade to log
  */
-#define h2_util_bb_log(c, i, level, tag, bb) \
+#define h2_util_bb_log(c, sid, level, tag, bb) \
 do { \
     char buffer[4 * 1024]; \
     const char *line = "(null)"; \