From: warmenhoven <warmenhoven>
Date: Wed, 12 Sep 2001 00:03:24 +0000 (+0000)
Subject: this gets faimtest to compile on my work box. stupid gcc 2.96
X-Git-Tag: rel_0_99_2~5
X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/commitdiff_plain/36938f1ee8a571c0b6c0c0b7f6aa75d87c53e53b

this gets faimtest to compile on my work box. stupid gcc 2.96
---

diff --git a/utils/faimtest/chat.c b/utils/faimtest/chat.c
index 31ce24b..e9a5f80 100644
--- a/utils/faimtest/chat.c
+++ b/utils/faimtest/chat.c
@@ -56,12 +56,12 @@ static int faimtest_chat_infoupdate(aim_session_t *sess, aim_frame_t *fr, ...)
 	usercount = va_arg(ap, int);
 	userinfo = va_arg(ap, struct aim_userinfo_s *);
 	roomdesc = va_arg(ap, char *);
-	unknown_c9 = va_arg(ap, fu16_t);
+	unknown_c9 = (fu16_t)va_arg(ap, unsigned int);
 	creationtime = va_arg(ap, fu32_t);
-	maxmsglen = va_arg(ap, fu16_t);
-	unknown_d2 = va_arg(ap, fu16_t);
-	unknown_d5 = va_arg(ap, fu16_t);
-	maxvisiblemsglen = va_arg(ap, fu16_t);
+	maxmsglen = (fu16_t)va_arg(ap, unsigned int);
+	unknown_d2 = (fu16_t)va_arg(ap, unsigned int);
+	unknown_d5 = (fu16_t)va_arg(ap, unsigned int);
+	maxvisiblemsglen = (fu16_t)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	dvprintf("faimtest: chat: %s:  info update:\n", croomname);
@@ -114,7 +114,7 @@ static int faimtest_chatnav_info(aim_session_t *sess, aim_frame_t *fr, ...)
 	va_list ap;
 
 	va_start(ap, fr);
-	type = va_arg(ap, fu16_t);
+	type = (fu16_t)va_arg(ap, unsigned int);
 
 	if (type == 0x0002) {
 		int maxrooms;
@@ -145,14 +145,14 @@ static int faimtest_chatnav_info(aim_session_t *sess, aim_frame_t *fr, ...)
 		fu32_t createtime;
 
 		fqcn = va_arg(ap, char *);
-		instance = va_arg(ap, fu16_t);
-		exchange = va_arg(ap, fu16_t);
-		flags = va_arg(ap, fu16_t);
+		instance = (fu16_t)va_arg(ap, unsigned int);
+		exchange = (fu16_t)va_arg(ap, unsigned int);
+		flags = (fu16_t)va_arg(ap, unsigned int);
 		createtime = va_arg(ap, fu32_t);
-		maxmsglen = va_arg(ap, fu16_t);
-		maxoccupancy = va_arg(ap, fu16_t);
-		createperms = va_arg(ap, fu8_t);
-		unknown = va_arg(ap, fu16_t);
+		maxmsglen = (fu16_t)va_arg(ap, unsigned int);
+		maxoccupancy = (fu16_t)va_arg(ap, unsigned int);
+		createperms = (fu8_t)va_arg(ap, unsigned int);
+		unknown = (fu16_t)va_arg(ap, unsigned int);
 		name = va_arg(ap, char *);
 		ck = va_arg(ap, char *);
 		va_end(ap);
diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index c3f0acf..f5b8e27 100644
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -461,8 +461,8 @@ static int faimtest_infochange(aim_session_t *sess, aim_frame_t *fr, ...)
 
 	va_start(ap, fr);
 	change = va_arg(ap, int);
-	perms = va_arg(ap, fu16_t);
-	type = va_arg(ap, fu16_t);
+	perms = (fu16_t)va_arg(ap, unsigned int);
+	type = (fu16_t)va_arg(ap, unsigned int);
 	length = va_arg(ap, int);
 	val = va_arg(ap, char *);
 	str = va_arg(ap, int);
@@ -944,7 +944,7 @@ static int faimtest_parse_userinfo(aim_session_t *sess, aim_frame_t *fr, ...)
 	userinfo = va_arg(ap, struct aim_userinfo_s *);
 	prof_encoding = va_arg(ap, char *);
 	prof = va_arg(ap, char *);
-	inforeq = va_arg(ap, fu16_t);
+	inforeq = (fu16_t)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	dvprintf("faimtest: userinfo: sn: %s\n", userinfo->sn);
@@ -1512,7 +1512,7 @@ static int faimtest_parse_genericerr(aim_session_t *sess, aim_frame_t *fr, ...)
 	fu16_t reason;
 
 	va_start(ap, fr);
-	reason = va_arg(ap, fu16_t);
+	reason = (fu16_t)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	dvprintf("faimtest: snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown");
@@ -1527,7 +1527,7 @@ static int faimtest_parse_msgerr(aim_session_t *sess, aim_frame_t *fr, ...)
 	fu16_t reason;
 
 	va_start(ap, fr);
-	reason = va_arg(ap, fu16_t);
+	reason = (fu16_t)va_arg(ap, unsigned int);
 	destsn = va_arg(ap, char *);
 	va_end(ap);
 
@@ -1543,7 +1543,7 @@ static int faimtest_parse_locerr(aim_session_t *sess, aim_frame_t *fr, ...)
 	fu16_t reason;
 
 	va_start(ap, fr);
-	reason = va_arg(ap, fu16_t);
+	reason = (fu16_t)va_arg(ap, unsigned int);
 	destsn = va_arg(ap, char *);
 	va_end(ap);
 
@@ -1568,10 +1568,10 @@ static int faimtest_parse_misses(aim_session_t *sess, aim_frame_t *fr, ...)
 	struct aim_userinfo_s *userinfo;
 
 	va_start(ap, fr);
-	chan = va_arg(ap, fu16_t);
+	chan = (fu16_t)va_arg(ap, unsigned int);
 	userinfo = va_arg(ap, struct aim_userinfo_s *);
-	nummissed = va_arg(ap, fu16_t);
-	reason = va_arg(ap, fu16_t);
+	nummissed = (fu16_t)va_arg(ap, unsigned int);
+	reason = (fu16_t)va_arg(ap, unsigned int);
 	va_end(ap);
 
 	dvprintf("faimtest: missed %d messages from %s on channel %d (reason %d: %s)\n", nummissed, userinfo->sn, chan, reason, (reason<missedreasonslen)?missedreasons[reason]:"unknown");
@@ -1589,7 +1589,7 @@ static int faimtest_parse_msgack(aim_session_t *sess, aim_frame_t *fr, ...)
 	char *sn = NULL;
 
 	va_start(ap, fr);
-	type = va_arg(ap, fu16_t);
+	type = (fu16_t)va_arg(ap, unsigned int);
 	sn = va_arg(ap, char *);
 	va_end(ap);
 
@@ -1615,12 +1615,12 @@ static int faimtest_parse_ratechange(aim_session_t *sess, aim_frame_t *fr, ...)
 	va_start(ap, fr); 
 
 	/* See code explanations below */
-	code = va_arg(ap, fu16_t);
+	code = (fu16_t)va_arg(ap, unsigned int);
 
 	/*
 	 * See comments above aim_parse_ratechange_middle() in aim_rxhandlers.c.
 	 */
-	rateclass = va_arg(ap, fu16_t);
+	rateclass = (fu16_t)va_arg(ap, unsigned int);
 
 	/*
 	 * Not sure what this is exactly.  I think its the temporal 
@@ -1690,7 +1690,7 @@ static int faimtest_parse_evilnotify(aim_session_t *sess, aim_frame_t *fr, ...)
 	struct aim_userinfo_s *userinfo;
 
 	va_start(ap, fr);
-	newevil = va_arg(ap, fu16_t);
+	newevil = (fu16_t)va_arg(ap, unsigned int);
 	userinfo = va_arg(ap, struct aim_userinfo_s *);
 	va_end(ap);