aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-10-27 19:36:48 +0000
committerGuy Harris <guy@alum.mit.edu>2004-10-27 19:36:48 +0000
commit7d4248680d4c766ac5ef756a1627fa0061d85d5e (patch)
tree564eea6411af9437c75d35011d0726b789f50a74 /merge.c
parent62988d944a089796cbc0f0a54c60ee85b3a334b9 (diff)
Fix indentation.
svn path=/trunk/; revision=12411
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/merge.c b/merge.c
index 9f640425e6..e71f1c42d6 100644
--- a/merge.c
+++ b/merge.c
@@ -345,15 +345,15 @@ merge_open_in_files(int in_file_count, char *in_file_names[], merge_in_file_t *i
if (merge_verbose == VERBOSE_ERRORS) {
fprintf(stderr, "mergecap: skipping %s: %s\n", in_file_names[i],
wtap_strerror(*err));
- switch (*err) {
-
- case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNSUPPORTED_ENCAP:
- case WTAP_ERR_BAD_RECORD:
- fprintf(stderr, "(%s)\n", err_info);
- g_free(err_info);
- break;
- }
+ switch (*err) {
+
+ case WTAP_ERR_UNSUPPORTED:
+ case WTAP_ERR_UNSUPPORTED_ENCAP:
+ case WTAP_ERR_BAD_RECORD:
+ fprintf(stderr, "(%s)\n", err_info);
+ g_free(err_info);
+ break;
+ }
}
} else {
if (merge_verbose == VERBOSE_ALL) {