aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-01-30 23:27:57 +0000
committerBill Meier <wmeier@newsguy.com>2011-01-30 23:27:57 +0000
commit7f0107220deb49187d7d5ba2eb13246b45f6bb11 (patch)
treea20bce4d29b63e0b5000df417fd5ea9a77fda49f /wiretap
parent043e0e0bbf6a2bf97f77124091ea78c9beb23088 (diff)
Fix various instances of "unreachable code".
svn path=/trunk/; revision=35713
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/buffer.c2
-rw-r--r--wiretap/file_access.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/buffer.c b/wiretap/buffer.c
index f7f977c06f..eae751cbd7 100644
--- a/wiretap/buffer.c
+++ b/wiretap/buffer.c
@@ -100,7 +100,7 @@ void buffer_remove_start(Buffer* buffer, gsize bytes)
g_error("buffer_remove_start trying to remove %" G_GINT64_MODIFIER "u bytes. s=%" G_GINT64_MODIFIER "u ff=%" G_GINT64_MODIFIER "u!\n",
(guint64)bytes, (guint64)buffer->start,
(guint64)buffer->first_free);
- exit(1);
+ /** g_error() does an abort() and thus never returns **/
}
buffer->start += bytes;
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index aea8d60ed3..b51015579e 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -669,7 +669,7 @@ const char *wtap_file_type_string(int filetype)
{
if (filetype < 0 || filetype >= wtap_num_file_types) {
g_error("Unknown capture file type %d", filetype);
- return NULL;
+ /** g_error() does an abort() and thus never returns **/
} else
return dump_open_table[filetype].name;
}