char *drep -> guint8 *drep

[obnox/wireshark/wip.git] / packet-smb.c

diff --git a/packet-smb.c b/packet-smb.c
index eec564cd9699fec5c27690363e281df46554508a..9a6c15a2ea0d6ceb8db49d4dd9fa9be03f3248a1 100644 (file)
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -3,7 +3,7 @@
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  * 2001  Rewrite by Ronnie Sahlberg and Guy Harris
  *
- * $Id: packet-smb.c,v 1.379 2003/12/18 00:18:54 guy Exp $
+ * $Id: packet-smb.c,v 1.385 2004/01/19 20:10:37 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -40,7 +40,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include "smb.h"
-#include "alignment.h"
 #include <epan/strutil.h>
 #include "prefs.h"
 #include "reassemble.h"
@@ -1255,8 +1254,8 @@ nt_time_to_nstime(guint32 filetime_high, guint32 filetime_low, nstime_t *tv)
        /*
         * Get the time as seconds and nanoseconds.
         */
-       tv->secs = d;
-       tv->nsecs = (d - tv->secs)*1000000000;
+       tv->secs = (time_t) d;
+       tv->nsecs = (int) ((d - tv->secs)*1000000000);
 
        return TRUE;
 }
@@ -4743,7 +4742,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
                        proto_item *litem = NULL;
                        proto_tree *ltree = NULL;
                        if(lt&0x10){
-                               char buf[8];
+                               guint8 buf[8];
                                guint32 val;
 
                                /* large lock format */
@@ -4827,7 +4826,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
                        proto_item *litem = NULL;
                        proto_tree *ltree = NULL;
                        if(lt&0x10){
-                               char buf[8];
+                               guint8 buf[8];
                                guint32 val;
 
                                /* large lock format */
@@ -7461,7 +7460,7 @@ static void map_standard_access(guint32 *access_mask,
 
 int
 dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                      proto_tree *tree, char *drep, int hfindex,
+                      proto_tree *tree, guint8 *drep, int hfindex,
                       struct access_mask_info *ami)
 {
        proto_item *item;
@@ -7671,7 +7670,7 @@ static int hf_smb_access_mask = -1;
 
 static int
 dissect_nt_v2_ace(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                 proto_tree *parent_tree, char *drep,
+                 proto_tree *parent_tree, guint8 *drep,
                  struct access_mask_info *ami)
 {
        proto_item *item = NULL;
@@ -7725,7 +7724,7 @@ dissect_nt_v2_ace(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_nt_acl(tvbuff_t *tvb, int offset, packet_info *pinfo,
-              proto_tree *parent_tree, char *drep, char *name,
+              proto_tree *parent_tree, guint8 *drep, char *name,
               struct access_mask_info *ami)
 {
        proto_item *item = NULL;
@@ -7871,7 +7870,7 @@ dissect_nt_sec_desc_type(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
 
 int
 dissect_nt_sec_desc(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                   proto_tree *parent_tree, char *drep, int len, 
+                   proto_tree *parent_tree, guint8 *drep, int len, 
                    struct access_mask_info *ami)
 {
        proto_item *item = NULL;
@@ -12805,7 +12804,7 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
        proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 1, TRUE);
        COUNT_BYTES_SUBR(1);
 
-       /* short file name */
+       /* short file name - it's not always in Unicode */
        sfn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &sfn_len, FALSE, TRUE, bcp);
        CHECK_STRING_SUBR(sfn);
        proto_tree_add_string(tree, hf_smb_short_file_name, tvb, offset, 24,
@@ -13504,7 +13503,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
                e_uuid_t fs_id;
                char uuid_str[DCERPC_UUID_STR_LEN]; 
                int uuid_str_len;
-               char drep = 0x10;
+               guint8 drep = 0x10;
                
                CHECK_BYTE_COUNT_TRANS_SUBR(16);