[Gaim-commits] CVS: gaim/src/protocols/gg libgg.c,1.13,1.14 libgg.h,1.8,1.9

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory sc8-pr-cvs1:/tmp/cvs-serv11225/src/protocols/gg

Modified Files:
	libgg.c libgg.h 
Log Message:
clean up a lot of compiler warnings.  Hopefully I didn't break anything too badly.


Index: libgg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/libgg.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- libgg.c	14 Jun 2003 23:21:01 -0000	1.13
+++ libgg.c	8 Jul 2003 06:11:49 -0000	1.14
@@ -253,7 +253,7 @@
 				return NULL;
 			}
 			if (errno != EINTR) {
-//				errno = EINVAL;
+				/* errno = EINVAL; */
 				free(buf);
 				return NULL;
 			}
@@ -529,7 +529,7 @@
  *
  * w przypadku b³êdu zwraca -1, inaczej numer sekwencyjny.
  */
-int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, unsigned char *message)
+int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, char *message)
 {
 	struct gg_send_msg s;
 
@@ -750,7 +750,7 @@
 		return -1;
 	}
 
-	p = (void*) h + sizeof(struct gg_header);
+	p = h + sizeof(struct gg_header);
 	
 	if (h->type == GG_RECV_MSG) {
 		struct gg_recv_msg *r = p;
@@ -926,7 +926,7 @@
 		case GG_STATE_CONNECTING:
 		{
 			char buf[1024];
-			int res, res_size = sizeof(res);
+			unsigned int res, res_size = sizeof(res);
 
 			gg_debug(GG_DEBUG_MISC, "== GG_STATE_CONNECTING\n");
 
@@ -1074,7 +1074,7 @@
 
 		case GG_STATE_CONNECTING_GG:
 		{
-			int res, res_size = sizeof(res);
+			unsigned int res, res_size = sizeof(res);
 
 			gg_debug(GG_DEBUG_MISC, "== GG_STATE_CONNECTING_GG\n");
 
@@ -1131,7 +1131,7 @@
 				break;
 			}
 	
-			w = (void*) h + sizeof(struct gg_header);
+			w = (struct gg_welcome *)(h + sizeof(struct gg_header));
 			w->key = fix32(w->key);
 
 			for (hash = 1; *password; password++)

Index: libgg.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/libgg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libgg.h	29 Aug 2002 01:47:14 -0000	1.8
+++ libgg.h	8 Jul 2003 06:11:49 -0000	1.9
@@ -107,7 +107,7 @@
 	GG_SESSION_GG = 1,	/* po³±czenie z serwerem gg */
 	GG_SESSION_HTTP,	/* ogólna sesja http */
 	GG_SESSION_SEARCH,	/* szukanie */
-	GG_SESSION_REGISTER,	/* rejestrowanie */
+	GG_SESSION_REGISTER	/* rejestrowanie */
 };
 
 /*
@@ -130,7 +130,7 @@
         /* gg_http */
 	GG_STATE_READING_HEADER,	/* czeka na nag³ówek http */
 	GG_STATE_PARSING,               /* przetwarza dane */
-	GG_STATE_DONE,                  /* skoñczy³ */
+	GG_STATE_DONE                  /* skoñczy³ */
 };
 
 /*
@@ -147,14 +147,14 @@
 enum {
 	GG_CHECK_NONE = 0,		/* nic. nie powinno wyst±piæ */
 	GG_CHECK_WRITE = 1,		/* sprawdzamy mo¿liwo¶æ zapisu */
-	GG_CHECK_READ = 2,		/* sprawdzamy mo¿liwo¶æ odczytu */
+	GG_CHECK_READ = 2		/* sprawdzamy mo¿liwo¶æ odczytu */
 };
 
 struct gg_session *gg_login(uin_t uin, char *password, int async);
 void gg_free_session(struct gg_session *sess);
 void gg_logoff(struct gg_session *sess);
 int gg_change_status(struct gg_session *sess, int status);
-int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, unsigned char *message);
+int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, char *message);
 int gg_ping(struct gg_session *sess);
 
 struct gg_notify_reply {
@@ -186,7 +186,7 @@
 	GG_EVENT_STATUS,
 	GG_EVENT_ACK,
 	GG_EVENT_CONN_FAILED,
-	GG_EVENT_CONN_SUCCESS,
+	GG_EVENT_CONN_SUCCESS
 };
 
 /*
@@ -199,7 +199,7 @@
 	GG_FAILURE_READING,
 	GG_FAILURE_WRITING,
 	GG_FAILURE_PASSWORD,
-	GG_FAILURE_404,
+	GG_FAILURE_404
 };
 
 /*
@@ -212,7 +212,7 @@
 	GG_ERROR_RESOLVING = 1,
 	GG_ERROR_CONNECTING,
 	GG_ERROR_READING,
-	GG_ERROR_WRITING,
+	GG_ERROR_WRITING
 };
 
 /*