Fix (Sun) compiler warnings as reported by David Kirkby: Part 1

svn path=/trunk/; revision=24295

3 files changed, 22 insertions, 21 deletions

diff --git a/wiretap/5views.c b/wiretap/5views.c
index edfb7b5c13..198b52e715 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -51,27 +51,27 @@ typedef struct
 }t_5VW_Attributes_Header;
 
 
-#define CST_5VW_INFO_HEADER_KEY		0xAAAAAAAA		/* signature */
+#define CST_5VW_INFO_HEADER_KEY		0xAAAAAAAAU		/* signature */
 
-#define	CST_5VW_INFO_RECORD_VERSION	0x00010000		/* version */
+#define	CST_5VW_INFO_RECORD_VERSION	0x00010000U		/* version */
 
 #define CST_5VW_DECALE_FILE_TYPE	24
-#define CST_5VW_SECTION_CAPTURES	0x08
+#define CST_5VW_SECTION_CAPTURES	0x08U
 #define CST_5VW_CAPTURES_FILE		(CST_5VW_SECTION_CAPTURES << CST_5VW_DECALE_FILE_TYPE)		/* 0x08000000 */
-#define CST_5VW_FLAT_FILE		0x10000000
+#define CST_5VW_FLAT_FILE		0x10000000U
 #define CST_5VW_CAPTURE_FILEID		(CST_5VW_FLAT_FILE | CST_5VW_CAPTURES_FILE)
-#define CST_5VW_FAMILY_CAP_ETH		0x01
-#define CST_5VW_FAMILY_CAP_WAN		0x02
+#define CST_5VW_FAMILY_CAP_ETH		0x01U
+#define CST_5VW_FAMILY_CAP_WAN		0x02U
 #define CST_5VW_DECALE_FILE_FAMILY	12
 #define CST_5VW_CAP_ETH			(CST_5VW_FAMILY_CAP_ETH << CST_5VW_DECALE_FILE_FAMILY)	/* 0x00001000 */
 #define CST_5VW_CAP_WAN			(CST_5VW_FAMILY_CAP_WAN << CST_5VW_DECALE_FILE_FAMILY)	/* 0x00002000 */
 #define CST_5VW_CAPTURE_ETH_FILEID	(CST_5VW_CAPTURE_FILEID | CST_5VW_CAP_ETH)
 #define CST_5VW_CAPTURE_WAN_FILEID	(CST_5VW_CAPTURE_FILEID | CST_5VW_CAP_WAN)
 
-#define CST_5VW_CAPTURE_FILE_TYPE_MASK	0xFF000000
+#define CST_5VW_CAPTURE_FILE_TYPE_MASK	0xFF000000U
 
-#define CST_5VW_FRAME_RECORD		0x00000000
-#define CST_5VW_RECORDS_HEADER_KEY	0x3333EEEE
+#define CST_5VW_FRAME_RECORD		0x00000000U
+#define CST_5VW_RECORDS_HEADER_KEY	0x3333EEEEU
 
 typedef struct
 {
@@ -97,11 +97,11 @@ typedef struct
 }t_5VW_TimeStamped_Header;
 
 
-#define CST_5VW_IA_CAP_INF_NB_TRAMES_STOCKEES	0x20000000
-#define CST_5VW_IA_DATE_CREATION		0x80000007	/* Struct t_Attrib_Date_Create */
-#define CST_5VW_TIMESTAMPED_HEADER_TYPE		0x4000
+#define CST_5VW_IA_CAP_INF_NB_TRAMES_STOCKEES	0x20000000U
+#define CST_5VW_IA_DATE_CREATION		0x80000007U	/* Struct t_Attrib_Date_Create */
+#define CST_5VW_TIMESTAMPED_HEADER_TYPE		0x4000U
 #define CST_5VW_CAPTURES_RECORD		(CST_5VW_SECTION_CAPTURES << 28)	/* 0x80000000 */
-#define CST_5VW_SYSTEM_RECORD		0x00000000
+#define CST_5VW_SYSTEM_RECORD		0x00000000U
 
 static gboolean _5views_read(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset);
diff --git a/wiretap/iseries.c b/wiretap/iseries.c
index 10c0d39acf..b9441884eb 100644
--- a/wiretap/iseries.c
+++ b/wiretap/iseries.c
@@ -255,7 +255,7 @@ iseries_check_file_type (wtap * wth, int *err, int format)
   guint line;
   int num_items_scanned;
   char buf[ISERIES_LINE_LENGTH], protocol[9], tcpformat[2];
-  guint8 *sdate;
+  char *sdate;
 
   /* Save trace format for passing between packets */
   sdate = g_malloc (10);
@@ -273,7 +273,7 @@ iseries_check_file_type (wtap * wth, int *err, int format)
 	   */
 	  if (wth->capture.iseries->format == ISERIES_FORMAT_UNICODE)
 	    {
-	      iseries_UNICODE_to_ASCII (buf, ISERIES_LINE_LENGTH);
+             iseries_UNICODE_to_ASCII ((guint8 *)buf, ISERIES_LINE_LENGTH);
 	    }
 	  g_strup(buf);
 	  num_items_scanned = sscanf (buf,
@@ -386,7 +386,7 @@ iseries_seek_next_packet (wtap * wth, int *err)
 	  if (wth->capture.iseries->format == ISERIES_FORMAT_UNICODE)
 	    {
 	      /* buflen is #bytes to 1st 0x0A */
-	      buflen = iseries_UNICODE_to_ASCII (buf, ISERIES_LINE_LENGTH);
+             buflen = iseries_UNICODE_to_ASCII ((guint8 *)buf, ISERIES_LINE_LENGTH);
 	    }
 	  else
 	    {
@@ -481,7 +481,8 @@ iseries_parse_packet (wtap * wth, FILE_T fh,
     tcpheader[81];
   char hex1[17], hex2[17], hex3[17], hex4[17];
   char data[ISERIES_LINE_LENGTH * 2];
-  guint8 *buf, *asciibuf, *tcpdatabuf, *workbuf;
+  guint8 *buf;
+  char   *asciibuf, *tcpdatabuf, *workbuf;
   struct tm tm;
 
   /*
@@ -505,7 +506,7 @@ iseries_parse_packet (wtap * wth, FILE_T fh,
       /* Convert UNICODE data to ASCII */
       if (wth->capture.iseries->format == ISERIES_FORMAT_UNICODE)
 	{
-	  iseries_UNICODE_to_ASCII (data, ISERIES_LINE_LENGTH);
+         iseries_UNICODE_to_ASCII ((guint8 *)data, ISERIES_LINE_LENGTH);
 	}
       /* look for packet header */
       for (i=0; i<8; i++) {      
@@ -543,7 +544,7 @@ iseries_parse_packet (wtap * wth, FILE_T fh,
   /*
    * If we have Wiretap Header then populate it here
    *
-   * XXX - Timer resolution on the iSeries is hardware dependant, the value for csec may be
+   * XXX - Timer resolution on the iSeries is hardware dependant; the value for csec may be
    * different on other platforms though all the traces I've seen seem to show resolution
    * to Milliseconds (i.e HH:MM:SS.nnnnn) or Nanoseconds (i.e HH:MM:SS.nnnnnn)
    */
@@ -614,7 +615,7 @@ iseries_parse_packet (wtap * wth, FILE_T fh,
       /* Convert UNICODE data to ASCII and determine line length */
       if (wth->capture.iseries->format == ISERIES_FORMAT_UNICODE)
 	{
-	  buflen = iseries_UNICODE_to_ASCII (data, ISERIES_LINE_LENGTH);
+         buflen = iseries_UNICODE_to_ASCII ((guint8 *)data, ISERIES_LINE_LENGTH);
 	}
       else
 	{
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index 780cde2bfe..807f93b25b 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -53,7 +53,7 @@ typedef struct {
 } ngsniffer_comp_stream_t;
 
 typedef struct {
-  guint8 *sdate;          /* Packet start date        */	
+  char *sdate;            /* Packet start date        */	
   gboolean tcp_formatted; /* TCP/IP data formated Y/N */
   int format;             /* Trace format type        */
 } iseries_t;