diff options
| -rw-r--r-- | capture.h | 2 | ||||
| -rw-r--r-- | color_filters.h | 1 | ||||
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | file.h | 8 | ||||
| -rw-r--r-- | tempfile.c | 1 |
5 files changed, 8 insertions, 8 deletions
@@ -107,7 +107,7 @@ typedef struct if_stat_cache_s if_stat_cache_t; /** * Start gathering capture statistics for the interfaces specified. - * @param A GList of if_info_t items + * @param if_list A GList of if_info_t items * @return A pointer to the statistics state data. */ extern if_stat_cache_t * capture_stat_start(GList *if_list); diff --git a/color_filters.h b/color_filters.h index 6ee0b11c91..9c4e8d1822 100644 --- a/color_filters.h +++ b/color_filters.h @@ -172,6 +172,7 @@ gboolean color_filters_export(gchar *path, GSList *cfl, gboolean only_selected); * @param filter_string the filter string * @param bg_color background color * @param fg_color foreground color + * @param disabled gboolean * @return the new color filter */ color_filter_t *color_filter_new( diff --git a/config.nmake b/config.nmake index eaa3eced3b..248902369a 100644 --- a/config.nmake +++ b/config.nmake @@ -7,7 +7,7 @@ # Only "win32" and "win64" are valid (for now). # This can be defined in the system environment. !IFNDEF WIRESHARK_TARGET_PLATFORM -WIRESHARK_TARGET_PLATFORM=win32 +WIRESHARK_TARGET_PLATFORM=win64 !ENDIF ##### Versions ##### @@ -655,7 +655,7 @@ MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe" # If you don't want the developers documentation (or don't have the tools), # comment this line out, so that DOXYGEN isn't defined. # -#DOXYGEN="$(PROGRAM_FILES)/doxygen/bin/doxygen.exe" +DOXYGEN="$(PROGRAM_FILES)/doxygen/bin/doxygen.exe" # # Recommended: Use the compressed html help format .chm as the Wireshark integrated help. @@ -83,6 +83,7 @@ cf_callback_remove(cf_callback_t func); * @param cf the capture file to be opened * @param fname the filename to be opened * @param is_tempfile is this a temporary file? + * @param err error code * @return one of cf_status_t */ cf_status_t cf_open(capture_file *cf, const char *fname, gboolean is_tempfile, int *err); @@ -216,7 +217,6 @@ void cf_set_tempfile_source(capture_file *cf, gchar *source); * return a non-null value. The returned value should not be freed. * * @param cf the capture file - * @param source the source description. this will be copied internally. */ const gchar *cf_get_tempfile_source(capture_file *cf); @@ -232,7 +232,7 @@ int cf_get_packet_count(capture_file *cf); * Set the number of packets in the capture file. * * @param cf the capture file - * @param the number of packets in the capture file + * @param packet_count the number of packets in the capture file */ void cf_set_packet_count(capture_file *cf, int packet_count); @@ -515,7 +515,6 @@ void cf_select_packet(capture_file *cf, int row); * Unselect all packets, if any. * * @param cf the capture file - * @param row the row to select */ void cf_unselect_packet(capture_file *cf); @@ -523,7 +522,6 @@ void cf_unselect_packet(capture_file *cf); * Unselect all protocol tree fields, if any. * * @param cf the capture file - * @param row the row to select */ void cf_unselect_field(capture_file *cf); @@ -567,7 +565,7 @@ void cf_unignore_frame(capture_file *cf, frame_data *frame); * NULL, a temporary file name is generated and *out_filename is set * to point to the generated file name * @param in_file_count the number of input files to merge - * @param in_filnames array of input filenames + * @param in_filenames array of input filenames * @param file_type the output filetype * @param do_append FALSE to merge chronologically, TRUE simply append * @return one of cf_status_t diff --git a/tempfile.c b/tempfile.c index 7a6b5656f9..2b5dfa878a 100644 --- a/tempfile.c +++ b/tempfile.c @@ -207,6 +207,7 @@ create_tempfile(char **namebuf, const char *pfx) * Create a directory with the given prefix (e.g. "wireshark"). The path * is created using g_get_tmp_dir and mkdtemp. * + * @param namebuf * @param pfx A prefix for the temporary directory. * @return The temporary directory path on success, or NULL on failure. * Must NOT be freed. |