The "cmd" members of "smb_saved_info_t" and "smb_info_t" structures

always contain an SMB command code (SMB requests and responses both have
command codes, so there's no "unknown" out-of-band value); make it a
"guint8".

Make the argument to "decode_smb_name()" a "guint8" as an SMB command
code is passed to it ("guint8" and "unsigned char" are the same types on
all platforms we're likely to deal with, so it's a cosmetic change, not
a semantic one).

Put in an extra "GPOINTER_TO_UINT()" call before casting
"si->sip->extra_info" to "guint16", to squelch compiler warnings.

svn path=/trunk/; revision=9335

1 files changed, 3 insertions, 3 deletions

diff --git a/smb.h b/smb.h
index e3fe57a3b9..8663fb5e43 100644
--- a/smb.h
+++ b/smb.h
@@ -2,7 +2,7 @@
  * Defines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: smb.h,v 1.53 2003/06/04 05:41:37 guy Exp $
+ * $Id: smb.h,v 1.54 2003/12/18 00:18:55 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -250,7 +250,7 @@ typedef struct {
 	guint32 frame_req, frame_res;
 	nstime_t req_time;
 	guint16 flags;
-	int cmd;
+	guint8 cmd;
 	void *extra_info;
 } smb_saved_info_t;
 
@@ -296,7 +296,7 @@ typedef struct conv_tables {
 } conv_tables_t;
 
 typedef struct smb_info {
-  int cmd;
+  guint8 cmd;
   int tid, pid, uid, mid;
   gboolean unicode;		/* Are strings in this SMB Unicode? */
   gboolean request;		/* Is this a request? */