diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-11-21 08:55:22 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-23 06:01:51 +0000 |
| commit | d4f355c1a740ec41717ed51811f41f1761ce22ed (patch) | |
| tree | b29d9ed64801af3df8ff52b4b3ec40106f6499e3 | |
| parent | 8ad64048b60eb8e10d2eb1efdabd3dc382e6ef28 (diff) | |
| download | wireshark-d4f355c1a740ec41717ed51811f41f1761ce22ed.tar.gz | |
merge: fix parameter 'in_files/in_count_files' not found in the function declaration [-Wdocumentation]
Change-Id: Ib3d9b7df5f1396179645456ea7359e711c26b8ef
Reviewed-on: https://code.wireshark.org/review/12003
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 9fad599c0f58092f0719839d980de849ba8f8400)
Reviewed-on: https://code.wireshark.org/review/12052
| -rw-r--r-- | wiretap/merge.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index 56dc5bfc4b..19c11cd577 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -165,10 +165,10 @@ merge_open_in_files(int in_file_count, const char *const *in_file_names, * @param in_files input file array to be closed */ static void -merge_close_in_files(int count, merge_in_file_t in_files[]) +merge_close_in_files(int in_file_count, merge_in_file_t in_files[]) { int i; - for (i = 0; i < count; i++) { + for (i = 0; i < in_file_count; i++) { cleanup_in_file(&in_files[i]); } } @@ -186,15 +186,15 @@ merge_close_in_files(int count, merge_in_file_t in_files[]) * @return the frame type */ static int -merge_select_frame_type(int count, merge_in_file_t files[]) +merge_select_frame_type(int in_file_count, merge_in_file_t in_files[]) { int i; int selected_frame_type; - selected_frame_type = wtap_file_encap(files[0].wth); + selected_frame_type = wtap_file_encap(in_files[0].wth); - for (i = 1; i < count; i++) { - int this_frame_type = wtap_file_encap(files[i].wth); + for (i = 1; i < in_file_count; i++) { + int this_frame_type = wtap_file_encap(in_files[i].wth); if (selected_frame_type != this_frame_type) { selected_frame_type = WTAP_ENCAP_PER_PACKET; break; |