summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2008-05-30 07:15:05 +0000
committerGuy Harris <guy@alum.mit.edu>2008-05-30 07:15:05 +0000
commitfa2b419e608f752c5051f62d84ec7e5cdffb1436 (patch)
tree93144b2a2f7a64f983540a8bbda24a1660685b45 /file.c
parent861f06b6163af970dd3f9496b7f9684d73ce7852 (diff)
downloadwireshark-fa2b419e608f752c5051f62d84ec7e5cdffb1436.tar.gz
Return the appropriate "everything OK" types.
svn path=/trunk/; revision=25405
Diffstat (limited to 'file.c')
-rw-r--r--file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 38e5eda0a0..977e9a32f1 100644
--- a/file.c
+++ b/file.c
@@ -1363,7 +1363,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
have to. */
return CF_ERROR;
} else
- return CF_READ_OK;
+ return CF_OK;
}
cf_status_t
@@ -1904,7 +1904,7 @@ cf_retap_packets(capture_file *cf, gboolean do_columns)
do_columns ? &cf->cinfo : NULL)) {
case PSP_FINISHED:
/* Completed successfully. */
- return CF_OK;
+ return CF_READ_OK;
case PSP_STOPPED:
/* Well, the user decided to abort the refiltering.