[Gaim-commits] CVS: gaim/src/protocols/jabber lib.h,1.4,1.5 libxode.h,1.5,1.6 socket.c,1.4,1.5

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

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

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


Index: lib.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/lib.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lib.h	16 Oct 2002 19:52:05 -0000	1.4
+++ lib.h	8 Jul 2003 06:11:49 -0000	1.5
@@ -161,7 +161,7 @@
 #define NETSOCKET_CLIENT 1
 #define NETSOCKET_UDP 2
 
-int make_netsocket(u_short port, char *host, int type);
+int make_netsocket(unsigned short port, char *host, int type);
 struct in_addr *make_addr(char *host);
 int set_fd_close_on_exec(int fd, int flag);
 
@@ -557,8 +557,8 @@
 int jlimit_check(jlimit r, char *key, int points);
 
 
-// #define KARMA_DEBUG
-// default to disable karma 
+/* #define KARMA_DEBUG */
+/* default to disable karma */
 #define KARMA_READ_MAX(k) (abs(k)*100) /* how much you are allowed to read off the sock */
 #define KARMA_INIT 5   /* internal "init" value */
 #define KARMA_HEARTBEAT 2 /* seconds to register for heartbeat */

Index: libxode.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/libxode.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libxode.h	18 May 2003 05:45:18 -0000	1.5
+++ libxode.h	8 Jul 2003 06:11:49 -0000	1.6
@@ -157,7 +157,7 @@
 #define NETSOCKET_CLIENT 1
 #define NETSOCKET_UDP 2
 
-int make_netsocket(u_short port, char *host, int type);
+int make_netsocket(unsigned short port, char *host, int type);
 struct in_addr *make_addr(char *host);
 int set_fd_close_on_exec(int fd, int flag);
 

Index: socket.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/socket.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- socket.c	16 Oct 2002 19:53:07 -0000	1.4
+++ socket.c	8 Jul 2003 06:11:49 -0000	1.5
@@ -53,7 +53,7 @@
  * type = NETSOCKET_UDP is a UDP connection socket
  */
 
-int make_netsocket(u_short port, char *host, int type)
+int make_netsocket(unsigned short port, char *host, int type)
 {
     int s, flag = 1;
     struct sockaddr_in sa;