aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-03-31 20:59:47 +0000
committerGuy Harris <guy@alum.mit.edu>2002-03-31 20:59:47 +0000
commit6bc1cb1c7d5a3476c75f7cbf3d644d5004963fe6 (patch)
tree93692c5af903f60b0d88386c6cf4ae5ce9ece28f /mergecap.c
parent63e8447614677ab3a296f1e273a584a6ff4025cd (diff)
From Joerg Mayer: mark function arguments as unused.
svn path=/trunk/; revision=5051
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c
index 024cbc74c4..74902a60c1 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -1,6 +1,6 @@
/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: mergecap.c,v 1.7 2002/02/24 01:26:42 guy Exp $
+ * $Id: mergecap.c,v 1.8 2002/03/31 20:59:47 guy Exp $
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
@@ -65,7 +65,7 @@ static out_file_t out_file;
* Routine to write frame to output file
*/
static void
-write_frame(u_char *user, const struct wtap_pkthdr *phdr, long offset,
+write_frame(u_char *user, const struct wtap_pkthdr *phdr, long offset _U_,
union wtap_pseudo_header *pseudo_header, const u_char *buf)
{
wtap_dumper *pdh = (wtap_dumper*)user;