aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asn1/c1222/packet-c1222-template.c2
-rw-r--r--epan/dissectors/packet-bacapp.c2
-rw-r--r--epan/dissectors/packet-c1222.c2
-rw-r--r--epan/dissectors/packet-ceph.c2
-rw-r--r--epan/dissectors/packet-eigrp.c2
-rw-r--r--epan/dissectors/packet-smpp.c4
-rw-r--r--epan/dissectors/packet-ucp.c6
-rw-r--r--epan/tvbuff.h2
-rw-r--r--plugins/mate/mate_util.c6
-rw-r--r--ui/help_url.h2
-rw-r--r--wsutil/unicode-utils.h3
11 files changed, 16 insertions, 17 deletions
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
index 3b677cf474..07bc6598d8 100644
--- a/asn1/c1222/packet-c1222-template.c
+++ b/asn1/c1222/packet-c1222-template.c
@@ -705,7 +705,7 @@ get_ber_len_size(guint32 n)
*
* \param ptr points to the buffer to be written
* \param n is the length to be BER encoded
- * \maxsize is the maximum number of bytes we're allowed to write
+ * \param maxsize is the maximum number of bytes we're allowed to write
* \returns length of encoded value in bytes
*/
static int
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 8c9d8b7ede..e0bfeb30ee 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -753,7 +753,7 @@ fReadPropertyMultipleRequest(tvbuff_t *tvb, packet_info *pinfo, proto_tree *subt
* listOfReadAccessResults SEQUENCE OF ReadAccessResult
* }
* @param tvb the tv buffer of the current data
- * @parma pinfo
+ * @param pinfo
* @param tree the tree to append this item to
* @param offset the offset in the tvb
* @return offset modified
diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c
index 583b3bac91..7f2da409cc 100644
--- a/epan/dissectors/packet-c1222.c
+++ b/epan/dissectors/packet-c1222.c
@@ -756,7 +756,7 @@ get_ber_len_size(guint32 n)
*
* \param ptr points to the buffer to be written
* \param n is the length to be BER encoded
- * \maxsize is the maximum number of bytes we're allowed to write
+ * \param maxsize is the maximum number of bytes we're allowed to write
* \returns length of encoded value in bytes
*/
static int
diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c
index 4b4c1b6867..eb335b5d27 100644
--- a/epan/dissectors/packet-ceph.c
+++ b/epan/dissectors/packet-ceph.c
@@ -31,7 +31,7 @@
void proto_reg_handoff_ceph(void);
void proto_register_ceph(void);
-/** Extending the Ceph Dissector.
+/* Extending the Ceph Dissector.
*
* Hello, this is a quick overview of the insertion points in the Ceph dissector
* it is assumed that you know how dissectors work in general (if not please
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index 9855ef4e3a..5453c3a681 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -648,7 +648,7 @@ static const value_string eigrp_saf_srv2string[] = {
* Dissect the Parameter TLV, which is used to convey metric weights and the
* hold time.
*
- * @usage
+ * @brief
* Note the addition of K6 for the new extended metrics, and does not apply to
* older TLV packet formats.
*/
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index bd4e00ce3e..f21d598da7 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -1149,9 +1149,7 @@ smpp_stats_tree_per_packet(stats_tree *st, /* st as it was passed to us */
* \param secs Returns the 'time_t' equivalent
* \param nsecs Returns the additional nano-seconds
*
- * \return Whether time is specified relative or absolute
- * \retval TRUE Relative time
- * \retval FALSE Absolute time
+ * \return Whether time is specified relative (TRUE) or absolute (FALSE)
*/
static gboolean
smpp_mktime(const char *datestr, time_t *secs, int *nsecs)
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 7c8d080e47..2ff17dcbb1 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -710,9 +710,9 @@ ucp_stats_tree_per_packet(stats_tree *st, /* st as it was passed to us */
* \param endpkt Returns pointer, indicating the end of the PDU
*
* \return The state of this PDU
- * \retval 0 Definitely UCP
- * \retval UCP_MALFORMED ???
- * \retval UCP_INV_CHK Nice packet, but checksum doesn't add up...
+ * 0 Definitely UCP
+ * UCP_MALFORMED ???
+ * UCP_INV_CHK Nice packet, but checksum doesn't add up...
*/
static int
check_ucp(tvbuff_t *tvb, int *endpkt)
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 65931257d0..b9e8a782d6 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -41,7 +41,7 @@
extern "C" {
#endif /* __cplusplus */
-/** @file
+/**
* "testy, virtual(-izable) buffer". They are testy in that they get mad when
* an attempt is made to access data beyond the bounds of their array. In that
* case, they throw an exception.
diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c
index edd3f42c82..704da31c84 100644
--- a/plugins/mate/mate_util.c
+++ b/plugins/mate/mate_util.c
@@ -849,9 +849,9 @@ extern void merge_avpl(AVPL* dst, AVPL* src, gboolean copy_avps) {
/**
* merge_avpl:
- * @name: the name of the new avpl.
- * @avpl: the avpl from which to get the avps.
- * @copy_avps: whether avps should be copied instead of referenced.
+ * @param name: the name of the new avpl.
+ * @param avpl: the avpl from which to get the avps.
+ * @param copy_avps: whether avps should be copied instead of referenced.
*
* Creates a new avpl containing the same avps as the given avpl
* It will either reference or copie the avps.
diff --git a/ui/help_url.h b/ui/help_url.h
index 7662910a4d..135c75f560 100644
--- a/ui/help_url.h
+++ b/ui/help_url.h
@@ -29,7 +29,7 @@
extern "C" {
#endif /* __cplusplus */
-/** @file
+/** @file help_url.h
* "Help" URLs.
*/
diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h
index 21e74968ee..83fa2bda67 100644
--- a/wsutil/unicode-utils.h
+++ b/wsutil/unicode-utils.h
@@ -30,7 +30,8 @@
#include <glib.h>
/**
- * @file Unicode convenience routines.
+ * @file
+ * Unicode convenience routines.
*/
WS_DLL_PUBLIC