Fix a number of doxygen directives.

svn path=/trunk/; revision=33930

4 files changed, 11 insertions, 9 deletions

diff --git a/epan/crypt/airpdcap_system.h b/epan/crypt/airpdcap_system.h
index c53b90078e..cf57201112 100644
--- a/epan/crypt/airpdcap_system.h
+++ b/epan/crypt/airpdcap_system.h
@@ -268,7 +268,7 @@ extern INT AirPDcapSetKeys(
 /**
  * It gets the keys collection fom the specified context.
  * @param ctx [IN] pointer to the current context
- * @param key [IN] a preallocated array of keys to be returned
+ * @param keys [IN] a preallocated array of keys to be returned
  * @param keys_nr [IN] the number of keys to return (the key array must
  * be able to contain at least keys_nr keys)
  * @return The number of keys returned
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 1de9b8cb7c..9a17d77ea2 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -374,7 +374,7 @@ extern Ssl_private_key_t *
 ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd);
 
 /** Deallocate the memory used for specified key
- @param pointer to the key to be freed */
+ @param key pointer to the key to be freed */
 extern void
 ssl_free_key(Ssl_private_key_t* key);
 
@@ -409,16 +409,17 @@ ssl_decrypt_pre_master_secret(SslDecryptSession*ssl_session,
     StringInfo* encrypted_pre_master, SSL_PRIVATE_KEY *pk);
 
 /** Try to decrypt an ssl record
- @param ssl_session the store all the session data
+ @param ssl ssl_session the store all the session data
  @param decoder the stream decoder to be used
  @param ct the content type of this ssl record
  @param in a pinter to the ssl record to be decrypted
  @param inl the record length
- @param out a pointer to the store for the decrypted data
+ @param comp_str
+ @param out_str a pointer to the store for the decrypted data
  @param outl the decrypted data len
  @return 0 on success */
 extern gint
-ssl_decrypt_record(SslDecryptSession*ssl,SslDecoder* decoder, gint ct,
+ssl_decrypt_record(SslDecryptSession* ssl,SslDecoder* decoder, gint ct,
         const guchar* in, guint inl, StringInfo* comp_str, StringInfo* out_str, guint* outl);
 
 
diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h
index dd2c3af4be..e61514ce51 100644
--- a/epan/dissectors/packet-tcp.h
+++ b/epan/dissectors/packet-tcp.h
@@ -245,6 +245,7 @@ extern gboolean decode_tcp_ports(tvbuff_t *, int, packet_info *, proto_tree *, i
 
 /** Associate process information with a given flow
  *
+ * @param frame_num The frame number
  * @param local_addr The local IPv4 or IPv6 address of the process
  * @param remote_addr The remote IPv4 or IPv6 address of the process
  * @param local_port The local TCP port of the process
diff --git a/epan/emem.h b/epan/emem.h
index b160e2d955..48aa206b23 100644
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -408,15 +408,15 @@ emem_strbuf_t *ep_strbuf_new(const gchar *init) G_GNUC_MALLOC;
 emem_strbuf_t *ep_strbuf_new_label(const gchar *init) G_GNUC_MALLOC;
 
 /**
- * Allocate an ephemeral string buffer with enough initial space for @alloc_len bytes
- * and a maximum of @max_alloc_len bytes.
+ * Allocate an ephemeral string buffer with enough initial space for alloc_len bytes
+ * and a maximum of max_alloc_len bytes.
  *
  * @param alloc_len The initial size of the buffer. This value can be 0, but a nonzero
  * value is recommended.
  * @param max_alloc_len The maximum size of the buffer. 0 means "unlimited" (within
  * reason).
  *
- * @return A newly-allocated string buffer. @str will be empty.
+ * @return A newly-allocated string buffer. str will be empty.
  */
 emem_strbuf_t *ep_strbuf_sized_new(gsize alloc_len, gsize max_alloc_len) G_GNUC_MALLOC;
 
@@ -425,7 +425,7 @@ emem_strbuf_t *ep_strbuf_sized_new(gsize alloc_len, gsize max_alloc_len) G_GNUC_
  *
  * @param strbuf The ep_strbuf-allocated string buffer to append to.
  * @param format A printf-style string format.
- * @param args The list of arguments to append.
+ * @param ap The list of arguments to append.
  */
 void ep_strbuf_append_vprintf(emem_strbuf_t *strbuf, const gchar *format, va_list ap);