Doxygen: Fix some warnings.

Change-Id: I0344d44d08d2e159c895d693500403c067039a44
Reviewed-on: https://code.wireshark.org/review/33894
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

10 files changed, 14 insertions, 7 deletions

diff --git a/capchild/capture_sync.h b/capchild/capture_sync.h
index b448b060e0..349737ed10 100644
--- a/capchild/capture_sync.h
+++ b/capchild/capture_sync.h
@@ -67,6 +67,10 @@ sync_pipe_kill(ws_process_id fork_child);
  *  @param type channel type string (or NULL if not used)
  *  @param center_freq1 VHT channel center frequency (or NULL if not used)
  *  @param center_freq2 VHT channel center frequency 2 (or NULL if not used)
+ *  @param data On success, *data points to a buffer containing the dumpcap output, On failure *data is NULL
+ *  @param primary_msg On success NULL, On failure points to an error message
+ *  @param secondary_msg On success NULL, On failure either points to an additional error message or is NULL
+ *  @param update_cb
  *  @return 0 on success
  */
 extern int
diff --git a/doxygen.cfg.in b/doxygen.cfg.in
index c4b0f53e86..d7bdcde1a0 100644
--- a/doxygen.cfg.in
+++ b/doxygen.cfg.in
@@ -889,7 +889,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                =
+EXCLUDE                = ui/qt/widgets/qcustomplot.cpp
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/epan/dissectors/packet-gsm_cbsp.c b/epan/dissectors/packet-gsm_cbsp.c
index 18b6114544..484948dddc 100644
--- a/epan/dissectors/packet-gsm_cbsp.c
+++ b/epan/dissectors/packet-gsm_cbsp.c
@@ -44,7 +44,7 @@ enum tlv_type {
 /*! Definition of a single IE (Information Element) */
 struct tlv_def {
 	enum tlv_type type;	/*!< TLV type */
-	guint8 fixed_len;	/*!< length in case of \ref TLV_TYPE_FIXED */
+	guint8 fixed_len;	/*!< length in case of TLV_TYPE_FIXED */
 };
 
 /*! Definition of All 256 IE / TLV */
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 38a58207c8..432936d763 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -825,7 +825,7 @@ static void dissect_fid (tvbuff_t*, packet_info*, proto_tree*, proto_tree*);
 static void dissect_nlp (tvbuff_t*, packet_info*, proto_tree*, proto_tree*);
 static void dissect_gds (tvbuff_t*, packet_info*, proto_tree*, proto_tree*);
 static void dissect_rh (tvbuff_t*, int, proto_tree*);
-static void dissect_sna_control(tvbuff_t*, int, int, proto_tree*, int, enum parse);
+static void dissect_sna_control(tvbuff_t* parent_tvb, int offset, int control_len, proto_tree* tree, int hpr, enum parse parse);
 
 static int sna_fid_to_str_buf(const address *addr, gchar *buf, int buf_len _U_)
 {
diff --git a/epan/filter_expressions.h b/epan/filter_expressions.h
index e1a1f7ea7f..2cca36c648 100644
--- a/epan/filter_expressions.h
+++ b/epan/filter_expressions.h
@@ -38,6 +38,7 @@ WS_DLL_PUBLIC void filter_expression_iterate_expressions(wmem_foreach_func func,
  *
  * @param label Label (button) text for the expression.
  * @param expr The display filter for the expression.
+ * @param comment A comment about the filter.
  * @param enabled Determines if the expression is shown in the UI.
  * @return A newly allocated and initialized struct filter_expression.
  */
diff --git a/epan/prefs-int.h b/epan/prefs-int.h
index 74fd1c0334..df391add94 100644
--- a/epan/prefs-int.h
+++ b/epan/prefs-int.h
@@ -270,7 +270,7 @@ prefs_pref_is_default(pref_t *pref);
  * @param unused unused
  */
 WS_DLL_PUBLIC
-guint pref_stash(pref_t *pref, gpointer unused _U_);
+guint pref_stash(pref_t *pref, gpointer unused);
 
 typedef struct pref_unstash_data
 {
@@ -303,7 +303,7 @@ guint pref_unstash(pref_t *pref, gpointer unstash_data_p);
  * @return Always returns 0.
  */
 WS_DLL_PUBLIC
-guint pref_clean_stash(pref_t *pref, gpointer unused _U_);
+guint pref_clean_stash(pref_t *pref, gpointer unused);
 
 /** Set a stashed preference to its default value.
  *
diff --git a/epan/proto.h b/epan/proto.h
index 2ba28980d9..76defa811e 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -619,7 +619,7 @@ typedef enum {
 #define BASE_EXT_STRING           0x00000200
 #define BASE_VAL64_STRING         0x00000400
 
-#define BASE_ALLOW_ZERO           0x00000800  /**< Display `<none>` instead of '<MISSING>' for zero sized byte array */
+#define BASE_ALLOW_ZERO           0x00000800  /**< Display `<none>` instead of `<MISSING>` for zero sized byte array */
 
 #define BASE_UNIT_STRING          0x00001000  /**< Add unit text to the field value */
 
diff --git a/plugins/epan/pluginifdemo/CMakeLists.txt b/plugins/epan/pluginifdemo/CMakeLists.txt
index 23b74cfde7..059bece0e1 100644
--- a/plugins/epan/pluginifdemo/CMakeLists.txt
+++ b/plugins/epan/pluginifdemo/CMakeLists.txt
@@ -39,7 +39,7 @@ set_source_files_properties(
 	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
 )
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories( ui ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 register_plugin_files(plugin.c
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 9f6cf1061c..15d52da6ec 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -300,6 +300,7 @@ public slots:
      * @param cf_path Path to the file.
      * @param display_filter Display filter to apply. May be empty.
      * @param type File type.
+     * @param is_tempfile TRUE/FALSE.
      * @return True on success, false on failure.
      */
     // XXX We might want to return a cf_read_status_t or a CaptureFile.
diff --git a/ui/qt/widgets/overlay_scroll_bar.h b/ui/qt/widgets/overlay_scroll_bar.h
index 937e84a55a..3c41c63c1e 100644
--- a/ui/qt/widgets/overlay_scroll_bar.h
+++ b/ui/qt/widgets/overlay_scroll_bar.h
@@ -27,6 +27,7 @@ public:
      * @param overlay_image An image containing a 1:1 mapping of nearby
      *        packet colors to raster lines. It should be sized in device
      *        pixels.
+     * @param packet_count Number of packets.
      * @param start_pos The first packet number represented by the image.
      *        -1 means no packet is selected.
      * @param end_pos The last packet number represented by the image. -1