osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Try to fix some of the build problems, it still bumms out on: 

tap-follow.c
tshark-tap-register.c
tap-follow.c(464) : error C2220: warning treated as error - no 'object' file gen
erated
tap-follow.c(464) : warning C4267: '=' : conversion from 'size_t' to 'guint32',
possible loss of data
tap-follow.c(610) : warning C4267: '=' : conversion from 'size_t' to 'guint32',
possible loss of data
tap-follow.c(639) : warning C4267: 'initializing' : conversion from 'size_t' to
'int', possible loss of data
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 10.0
\VC\BIN\x86_amd64\cl.EXE"' : return code '0x2'
Stop.

svn path=/trunk/; revision=40855
This commit is contained in:
Anders Broman 2012-02-05 11:41:43 +00:00
parent 4b3e6f6fff
commit 0d4d762926
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tap-follow.c
View File

@ -46,6 +46,7 @@
#include <epan/tap.h>
#include <epan/tvbuff-int.h>
#include "wsutil/file_util.h"
#include "tempfile.h"
WS_VAR_IMPORT FILE *data_out_file;
@ -149,7 +150,7 @@ followStrFilter(
switch (fp->type)
{
case type_TCP:
len = snprintf(filter, sizeof filter,
len = g_snprintf(filter, sizeof filter,
"tcp.stream eq %d", fp->index);
break;
case type_UDP:
@ -165,7 +166,7 @@ followStrFilter(
switch (fp->type)
{
case type_TCP:
len = snprintf(filter, sizeof filter,
len = g_snprintf(filter, sizeof filter,
"((ip%s.src eq %s and tcp.srcport eq %d) and "
"(ip%s.dst eq %s and tcp.dstport eq %d))"
" or "
@ -177,7 +178,7 @@ followStrFilter(
verp, ip0, fp->port[0]);
break;
case type_UDP:
len = snprintf(filter, sizeof filter,
len = g_snprintf(filter, sizeof filter,
"((ip%s.src eq %s and udp.srcport eq %d) and "
"(ip%s.dst eq %s and udp.dstport eq %d))"
" or "
@ -221,7 +222,7 @@ followFileClose(
if (fp->filenamep != NULL)
{
unlink(fp->filenamep);
ws_unlink(fp->filenamep);
g_free(fp->filenamep);
fp->filenamep = NULL;
}
@ -251,16 +252,16 @@ followFileOpen(
fp->filenamep = g_strdup(tempfilep);
if (fp->filenamep == NULL)
{
close(fd);
unlink(tempfilep);
ws_close(fd);
ws_unlink(tempfilep);
followExit("Error duping temp file name.");
}
fp->filep = fdopen(fd, "w+b");
if (fp->filep == NULL)
{
close(fd);
unlink(fp->filenamep);
ws_close(fd);
ws_unlink(fp->filenamep);
g_free(fp->filenamep);
fp->filenamep = NULL;
followExit("Error opening temp file stream.");
@ -365,7 +366,7 @@ followPrintHex(
if ((ii % BYTES_PER_LINE) == 0)
{
/* new line */
sprintf(line, "%0*X", OFFSET_LEN, offset);
g_snprintf(line, LINE_LEN + 1, "%0*X", OFFSET_LEN, offset);
memset(line + HEX_START - OFFSET_SPACE, ' ',
HEX_LEN + OFFSET_SPACE + HEX_SPACE);