Clean up some 64-bit issues.

svn path=/trunk/; revision=28117

3 files changed, 47 insertions, 53 deletions

diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 08968ed040..c49df61003 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -335,13 +335,13 @@ static gint ett_afs_vldb_flags = -1;
 /* Output a unsigned integer, stored into field 'field'
    Assumes it is in network byte order, converts to host before using */
 #define OUT_UINT(field) \
-	proto_tree_add_uint(tree, field, tvb, offset, sizeof(guint32), tvb_get_ntohl(tvb, offset)); \
+	proto_tree_add_uint(tree, field, tvb, offset, 4, tvb_get_ntohl(tvb, offset)); \
 	offset += 4;
 
 /* Output a unsigned integer, stored into field 'field'
    Assumes it is in network byte order, converts to host before using */
 #define OUT_INT(field) \
-	proto_tree_add_int(tree, field, tvb, offset, sizeof(gint32), tvb_get_ntohl(tvb, offset)); \
+	proto_tree_add_int(tree, field, tvb, offset, 4, tvb_get_ntohl(tvb, offset)); \
 	offset += 4;
 
 /* Output a unsigned integer, stored into field 'field'
@@ -360,11 +360,11 @@ static gint ett_afs_vldb_flags = -1;
    Assumes it is in network byte order, converts to host before using,
    Note - does not increment offset, so can be used repeatedly for bitfields */
 #define DISP_UINT(field) \
-	proto_tree_add_uint(tree,field,tvb,offset,sizeof(guint32),tvb_get_ntohl(tvb, offset));
+	proto_tree_add_uint(tree,field,tvb,offset,4,tvb_get_ntohl(tvb, offset));
 
 /* Output an IPv4 address, stored into field 'field' */
 #define OUT_IP(field) \
-	proto_tree_add_ipv4(tree,field,tvb,offset,sizeof(gint32),\
+	proto_tree_add_ipv4(tree,field,tvb,offset,4,\
 		tvb_get_letohl(tvb, offset));\
 	offset += 4;
 
@@ -384,7 +384,7 @@ static gint ett_afs_vldb_flags = -1;
 	{ \
 		unsigned int j,i; \
 		j = tvb_get_ntohl(tvb, offset); \
-		offset += sizeof(guint32); \
+		offset += 4; \
 		for (i=0; i<j; i++) { \
 			func; \
 		} \
@@ -396,7 +396,7 @@ static gint ett_afs_vldb_flags = -1;
 	{ nstime_t ts; \
 	ts.secs = tvb_get_ntohl(tvb, offset); \
 	ts.nsecs = tvb_get_ntohl(tvb, offset+4)*1000; \
-	proto_tree_add_time(tree,field, tvb,offset,2*sizeof(guint32),&ts); \
+	proto_tree_add_time(tree,field, tvb,offset,2*4,&ts); \
 	offset += 8; \
 	}
 
@@ -407,7 +407,7 @@ static gint ett_afs_vldb_flags = -1;
 	{ nstime_t ts; \
 	ts.secs = tvb_get_ntohl(tvb, offset); \
 	ts.nsecs = 0; \
-	proto_tree_add_time(tree,field, tvb,offset,sizeof(guint32),&ts); \
+	proto_tree_add_time(tree,field, tvb,offset,4,&ts); \
 	offset += 4; \
 	}
 
@@ -437,10 +437,10 @@ static gint ett_afs_vldb_flags = -1;
 		for (i_orxsv=0; i_orxsv<length; i_orxsv++)\
 		{\
 			tmp_orxsv[i_orxsv] = (char) tvb_get_ntohl(tvb, offset);\
-			offset += sizeof(guint32);\
+			offset += 4;\
 		}\
 		tmp_orxsv[length] = '\0';\
-		proto_tree_add_string(tree, field, tvb, soff_orxsv, length*sizeof(guint32), tmp_orxsv);\
+		proto_tree_add_string(tree, field, tvb, soff_orxsv, length*4, tmp_orxsv);\
 	}
 
 
@@ -487,21 +487,21 @@ static gint ett_afs_vldb_flags = -1;
 		guint32 mask_ofsm; \
 		mask_ofsm = tvb_get_ntohl(tvb, offset); \
 		ti_ofsm = proto_tree_add_uint(tree, hf_afs_fs_status_mask, tvb, offset, \
-			sizeof(guint32), mask_ofsm); \
+			4, mask_ofsm); \
 		save_ofsm = tree; \
 		tree = proto_item_add_subtree(ti_ofsm, ett_afs_status_mask); \
 		proto_tree_add_boolean(tree, hf_afs_fs_status_mask_setmodtime, \
-			tvb,offset,sizeof(guint32), mask_ofsm); \
+			tvb,offset,4, mask_ofsm); \
 		proto_tree_add_boolean(tree, hf_afs_fs_status_mask_setowner, \
-			tvb,offset,sizeof(guint32), mask_ofsm); \
+			tvb,offset,4, mask_ofsm); \
 		proto_tree_add_boolean(tree, hf_afs_fs_status_mask_setgroup, \
-			tvb,offset,sizeof(guint32), mask_ofsm); \
+			tvb,offset,4, mask_ofsm); \
 		proto_tree_add_boolean(tree, hf_afs_fs_status_mask_setmode, \
-			tvb,offset,sizeof(guint32), mask_ofsm); \
+			tvb,offset,4, mask_ofsm); \
 		proto_tree_add_boolean(tree, hf_afs_fs_status_mask_setsegsize, \
-			tvb,offset,sizeof(guint32), mask_ofsm); \
+			tvb,offset,4, mask_ofsm); \
 		proto_tree_add_boolean(tree, hf_afs_fs_status_mask_fsync, \
-			tvb,offset,sizeof(guint32), mask_ofsm); \
+			tvb,offset,4, mask_ofsm); \
 		offset += 4; \
 		tree = save_ofsm; \
 	}
@@ -512,17 +512,17 @@ static gint ett_afs_vldb_flags = -1;
 		guint32 flags; \
 		flags = tvb_get_ntohl(tvb, offset); \
 		ti = proto_tree_add_uint(tree, hf_afs_vldb_flags, tvb, offset, \
-			sizeof(guint32), flags); \
+			4, flags); \
 		save = tree; \
 		tree = proto_item_add_subtree(ti, ett_afs_vldb_flags); \
 		proto_tree_add_boolean(tree, hf_afs_vldb_flags_rwexists, \
-			tvb,offset,sizeof(guint32), flags); \
+			tvb,offset,4, flags); \
 		proto_tree_add_boolean(tree, hf_afs_vldb_flags_roexists, \
-			tvb,offset,sizeof(guint32), flags); \
+			tvb,offset,4, flags); \
 		proto_tree_add_boolean(tree, hf_afs_vldb_flags_bkexists, \
-			tvb,offset,sizeof(guint32), flags); \
+			tvb,offset,4, flags); \
 		proto_tree_add_boolean(tree, hf_afs_vldb_flags_dfsfileset, \
-			tvb,offset,sizeof(guint32), flags); \
+			tvb,offset,4, flags); \
 		offset += 4; \
 		tree = save; \
 	}
@@ -677,9 +677,9 @@ static gint ett_afs_vldb_flags = -1;
 
 /* Output a UUID */
 #define OUT_UUID(x) \
-	OUT_BYTES(x, 11*sizeof(guint32));
+	OUT_BYTES(x, 11*4);
 #define SKIP_UUID() \
-	SKIP(11*sizeof(guint32));
+	SKIP(11*4);
 
 
 /* Output a bulkaddr */
@@ -783,7 +783,7 @@ static gint ett_afs_vldb_flags = -1;
 /* Skip the opcode */
 #define SKIP_OPCODE() \
 	{ \
-		SKIP(sizeof(guint32)); \
+		SKIP(4); \
 	}
 
 /* Output a UBIK version code */
@@ -803,12 +803,12 @@ static gint ett_afs_vldb_flags = -1;
 		tree = proto_item_add_subtree(ti, ett_afs_ubikver); \
 		if ( epoch != 0 ) \
 		proto_tree_add_time(tree,hf_afs_ubik_version_epoch, tvb,offset-8, \
-			sizeof(guint32),&ts); \
+			4,&ts); \
 		else \
 			proto_tree_add_text(tree, tvb, offset-8, \
-			sizeof(guint32),"Epoch: 0"); \
+			4,"Epoch: 0"); \
 		proto_tree_add_uint(tree,hf_afs_ubik_version_counter, tvb,offset-4, \
-			sizeof(guint32),counter); \
+			4,counter); \
 		tree = save; \
 	}
 
@@ -2649,7 +2649,7 @@ dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int o
 						}
 						SKIP(4);
 					}
-					SKIP(8 * sizeof(guint32));
+					SKIP(8 * 4);
 					OUT_UINT(hf_afs_vldb_rwvol);
 					OUT_UINT(hf_afs_vldb_rovol);
 					OUT_UINT(hf_afs_vldb_bkvol);
@@ -2697,7 +2697,7 @@ dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int o
 						}
 						SKIP(4);
 					}
-					SKIP(13 * sizeof(guint32));
+					SKIP(13 * 4);
 					OUT_UINT(hf_afs_vldb_rwvol);
 					OUT_UINT(hf_afs_vldb_rovol);
 					OUT_UINT(hf_afs_vldb_bkvol);
@@ -2729,7 +2729,7 @@ dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int o
 						}
 						else
 						{
-							SKIP(sizeof(guint32));
+							SKIP(4);
 						}
 					}
 					for (i=0; i<13; i++)
@@ -2754,7 +2754,7 @@ dissect_vldb_reply(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int o
 						}
 						else
 						{
-							SKIP(sizeof(guint32));
+							SKIP(4);
 						}
 					}
 					OUT_UINT(hf_afs_vldb_rwvol);
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index e80f6e3908..c9b0b019f8 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -12147,7 +12147,7 @@ proto_register_ansi_a(void)
         register_dissector_table("ansi_a.pld", "IS-801 (PLD)",
         FT_UINT8, BASE_DEC);
 
-    proto_register_subtree_array(ett, ett_len / sizeof(gint *));
+    proto_register_subtree_array(ett, ett_len / (int)sizeof(gint *));
 
     ansi_a_tap = register_tap("ansi_a");
 
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index 5d319dc14c..288d74566e 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -152,8 +152,7 @@ dissect_aodv_ext(tvbuff_t * tvb, int offset, proto_tree * tree)
 {
     proto_tree *ext_tree;
     proto_item *ti;
-    aodv_ext_t aodvext, *ext;
-    int len;
+    guint8 type, len;
 
     if (!tree)
 	return;
@@ -162,32 +161,27 @@ dissect_aodv_ext(tvbuff_t * tvb, int offset, proto_tree * tree)
     if ((int) tvb_reported_length(tvb) <= offset)
 	return;			/* No more options left */
 
-    ext = &aodvext;
-    tvb_memcpy(tvb, (guint8 *) ext, offset, sizeof(*ext));
-    len = ext->length;
+    type = tvb_get_guint8(tvb, offset);
+    len = tvb_get_guint8(tvb, offset + 1);
 
-    ti = proto_tree_add_text(tree, tvb, offset, sizeof(aodv_ext_t) +
-			     len, "Extensions");
+    ti = proto_tree_add_text(tree, tvb, offset, 2 + len, "Extensions");
     ext_tree = proto_item_add_subtree(ti, ett_aodv_extensions);
 
+    proto_tree_add_text(ext_tree, tvb, offset, 1,
+			"Type: %u (%s)", type,
+			val_to_str(type, exttype_vals, "Unknown"));
+
     if (len == 0) {
-	proto_tree_add_text(ext_tree, tvb,
-			    offset + offsetof(aodv_ext_t, length), 1,
-			    "Invalid option length: %u", ext->length);
+	proto_tree_add_text(ext_tree, tvb, offset + 1, 1,
+			    "Invalid option length: %u", len);
 	return;			/* we must not try to decode this */
     }
+    proto_tree_add_text(ext_tree, tvb, offset + 1, 1,
+			"Length: %u bytes", len);
 
-    proto_tree_add_text(ext_tree, tvb,
-			offset + offsetof(aodv_ext_t, type), 1,
-			"Type: %u (%s)", ext->type,
-			val_to_str(ext->type, exttype_vals, "Unknown"));
-    proto_tree_add_text(ext_tree, tvb,
-			offset + offsetof(aodv_ext_t, length), 1,
-			"Length: %u bytes", ext->length);
-
-    offset += sizeof(aodv_ext_t);
+    offset += 2;
 
-    switch (ext->type) {
+    switch (type) {
     case AODV_EXT_INT:
 	proto_tree_add_uint(ext_tree, hf_aodv_ext_interval,
 			    tvb, offset, 4, tvb_get_ntohl(tvb, offset));
@@ -202,7 +196,7 @@ dissect_aodv_ext(tvbuff_t * tvb, int offset, proto_tree * tree)
     /* If multifield extensions appear, we need more
      * sophisticated handler.  For now, this is okay. */
 
-    offset += ext->length;
+    offset += len;
     goto again;
 }