osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix some comments. 

Change-Id: I8f22a38a944573e43f6232e0fab6188967deefd6
Reviewed-on: https://code.wireshark.org/review/24999
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2017-12-26 10:33:22 -08:00
parent 9578e70d72
commit 6e844dc46a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wiretap/merge.c
View File

@ -246,7 +246,8 @@ is_earlier(nstime_t *l, nstime_t *r) /* XXX, move to nstime.c */
* @param err wiretap error, if failed
* @param err_info wiretap error string, if failed
* @return pointer to merge_in_file_t for file from which that packet
* came, or NULL on error or EOF
* came or on which we got a read error, or NULL if we're at EOF on
* all files
*/
static merge_in_file_t *
merge_read_packet(int in_file_count, merge_in_file_t in_files[],
@ -324,7 +325,8 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[],
* @param err wiretap error, if failed
* @param err_info wiretap error string, if failed
* @return pointer to merge_in_file_t for file from which that packet
* came, or NULL on error or EOF
* came or on which we got a read error, or NULL if we're at EOF on
* all files
*/
static merge_in_file_t *
merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
@ -830,7 +832,7 @@ merge_process_packets(wtap_dumper *pdh, const int file_type,
}
if (in_file == NULL) {
/* EOF */
/* We're at EOF on all input files */
break;
}