forked from osmocom/wireshark
From Peter Johansson:
Fix warnings svn path=/trunk/; revision=21214
This commit is contained in:
parent
25dbb9216f
commit
d565967b58
|
@ -1056,7 +1056,7 @@ decode_vol_attribute (proto_tree *tree, tvbuff_t *tvb, gint offset)
|
|||
#define DATE_NOT_SET 0x80000000
|
||||
#define AD_DATE_DELTA 946684800
|
||||
#define AD_DATE_TO_UNIX(x) (x + AD_DATE_DELTA)
|
||||
static guint32
|
||||
static void
|
||||
print_date(proto_tree *tree,int id, tvbuff_t *tvb, gint offset)
|
||||
{
|
||||
time_t date = tvb_get_ntohl(tvb, offset);
|
||||
|
@ -1065,8 +1065,6 @@ print_date(proto_tree *tree,int id, tvbuff_t *tvb, gint offset)
|
|||
tv.secs = AD_DATE_TO_UNIX(date);
|
||||
tv.nsecs = 0;
|
||||
proto_tree_add_time(tree, id, tvb, offset, 4, &tv);
|
||||
|
||||
return (guint32) date;
|
||||
}
|
||||
|
||||
/* -------------------------- */
|
||||
|
|
|
@ -196,9 +196,9 @@ static guint16 checksum (guint8 *buffer, gint len, gint offset)
|
|||
if ((c1 += c0) > 254) { c1 -= 255; }
|
||||
}
|
||||
|
||||
if ((cs = ((ctmp * c0) - c1) % 255L) < 0) { cs += 255; }
|
||||
if ((cs = ((ctmp * c0) - c1) % 255) < 0) { cs += 255; }
|
||||
ret = cs << 8;
|
||||
if ((cs = (c1 - ((ctmp + 1L) * c0)) % 255L) < 0) { cs += 255; }
|
||||
if ((cs = (c1 - ((ctmp + 1L) * c0)) % 255) < 0) { cs += 255; }
|
||||
ret |= cs;
|
||||
|
||||
return ret;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -26,6 +26,8 @@
|
|||
#ifndef __PACKET_SMB_H__
|
||||
#define __PACKET_SMB_H__
|
||||
|
||||
#include <epan/emem.h>
|
||||
|
||||
WS_VAR_IMPORT gboolean sid_name_snooping;
|
||||
|
||||
/* SMB command codes, from the SNIA CIFS spec. With MSVC and a
|
||||
|
|
Loading…
Reference in New Issue