Fix some comments.

Change-Id: I8f22a38a944573e43f6232e0fab6188967deefd6
Reviewed-on: https://code.wireshark.org/review/24999
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 5 insertions, 3 deletions

diff --git a/wiretap/merge.c b/wiretap/merge.c
index efe4089ead..b1eb8971f0 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -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;
         }