git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix comments.
[obnox/wireshark/wip.git]
/
merge.c
diff --git
a/merge.c
b/merge.c
index bedb342855dec194616869c6e1422d4ff135f1ea..b64d65baeedbb91ec3d94a4e10f4ab670d9383d7 100644
(file)
--- a/
merge.c
+++ b/
merge.c
@@
-41,7
+41,7
@@
merge_open_in_files(int in_file_count, char *const *in_file_names,
merge_in_file_t *files;
gint64 size;
- files = g_malloc(files_size);
+ files =
(merge_in_file_t *)
g_malloc(files_size);
*in_files = files;
for (i = 0; i < in_file_count; i++) {