From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 30 May 2016 19:58:14 +0000 (+0000)
Subject: Fix some obvious doxygen warning
X-Git-Tag: 2.4.21~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec99d0a4811dd6e6fb70c521a3ee75bc8d46050a;p=apache

Fix some obvious doxygen warning

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1746184 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_mplx.h b/modules/http2/h2_mplx.h
index e92a5ea344..f2f60fc9b3 100644
--- a/modules/http2/h2_mplx.h
+++ b/modules/http2/h2_mplx.h
@@ -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 *m, apr_interval_time_t timeout,
  * 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
diff --git a/modules/http2/h2_push.h b/modules/http2/h2_push.h
index d3519dcbfe..62f5a0a78f 100644
--- a/modules/http2/h2_push.h
+++ b/modules/http2/h2_push.h
@@ -63,7 +63,7 @@ apr_array_header_t *h2_push_collect(apr_pool_t *p,
 /**
  * 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
  */
diff --git a/modules/http2/h2_stream.h b/modules/http2/h2_stream.h
index dd2c193358..f80f8115e7 100644
--- a/modules/http2/h2_stream.h
+++ b/modules/http2/h2_stream.h
@@ -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_stream *stream,
  * @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_response(h2_stream *stream);
  * 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.
  */
diff --git a/modules/http2/h2_util.h b/modules/http2/h2_util.h
index 99724d7a5d..b6428d2831 100644
--- a/modules/http2/h2_util.h
+++ b/modules/http2/h2_util.h
@@ -58,7 +58,7 @@ void *h2_ihash_get(h2_ihash_t *ih, int id);
  * @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_iq_cmp *cmp, void *ctx);
  * @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, apr_size_t bmax,
  * 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)"; \