aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-02-22 16:41:41 +0000
committerEvan Huus <eapache@gmail.com>2013-02-22 16:41:41 +0000
commit9b45e7ad74da3ab34ebedd3a6cde93e560333366 (patch)
tree024c29cc3ec6b812d9ea5cb36ff12521b110e6e3 /epan
parent3b5017cc0e054db441068d0bf45a69cdff68bcf8 (diff)
Fix an *extraordinarily* embarassing copy-paste error. Much thanks to Bill
Meier for finding it before it made it into a stable release! svn path=/trunk/; revision=47816
Diffstat (limited to 'epan')
-rw-r--r--epan/wmem/wmem_scopes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/wmem/wmem_scopes.c b/epan/wmem/wmem_scopes.c
index fbb1f75c43..26a360ea16 100644
--- a/epan/wmem/wmem_scopes.c
+++ b/epan/wmem/wmem_scopes.c
@@ -64,7 +64,7 @@ wmem_packet_scope(void)
g_assert(packet_scope);
g_assert(in_packet_scope);
- return epan_scope;
+ return packet_scope;
}
void
@@ -95,7 +95,7 @@ wmem_file_scope(void)
g_assert(file_scope);
g_assert(in_file_scope);
- return epan_scope;
+ return file_scope;
}
void