From d0b620c55558afa5b4248620facc404ef4ffa48c Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Thu, 21 Jul 2005 09:37:39 +0000 Subject: [PATCH] fix pointer mismatches, warnings are errors again --- ChangeLog | 4 ++++ arch/linux/ipx_mcast4.c | 4 ++-- arch/linux/ipx_udp.c | 4 ++-- d2x.xcode/project.pbxproj | 4 ++-- main/network.c | 20 ++++++++++---------- main/network.h | 6 +++--- main/newdemo.c | 4 ++-- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 237b50f6..700d27d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ add some files (so it builds), warnings are not errors (ubyte *, sbyte * mismatches found when using gcc 4.0) + * arch/linux/ipx_mcast4.c, arch/linux/ipx_udp.c, + d2x.xcode/project.pbxproj, main/network.c, main/network.h, + main/newdemo.c: fix pointer mismatches, warnings are errors again + 2005-07-03 Chris Taylor * include/ui.h, ui/file.c, ui/inputbox.c: add ui_inputbox_set_text diff --git a/arch/linux/ipx_mcast4.c b/arch/linux/ipx_mcast4.c index 9393e664..0f739b8b 100644 --- a/arch/linux/ipx_mcast4.c +++ b/arch/linux/ipx_mcast4.c @@ -1,4 +1,4 @@ -/* $Id: ipx_mcast4.c,v 1.2 2003-12-08 22:55:27 btb Exp $ */ +/* $Id: ipx_mcast4.c,v 1.3 2005-07-21 09:34:22 chris Exp $ */ /* * @@ -189,7 +189,7 @@ static int ipx_mcast4_ReceivePacket(ipx_socket_t *sk, char *outbuf, int outbufsi { int size; struct sockaddr_in fromaddr; - int fromaddrsize = sizeof(fromaddr); + uint fromaddrsize = sizeof(fromaddr); if((size = recvfrom(sk->fd, outbuf, outbufsize, 0, (struct sockaddr*)&fromaddr, &fromaddrsize)) < 0) return -1; diff --git a/arch/linux/ipx_udp.c b/arch/linux/ipx_udp.c index 04073bc2..3d3b6be2 100644 --- a/arch/linux/ipx_udp.c +++ b/arch/linux/ipx_udp.c @@ -1,4 +1,4 @@ -/* $Id: ipx_udp.c,v 1.10 2004-01-08 16:48:34 schaffner Exp $ */ +/* $Id: ipx_udp.c,v 1.11 2005-07-21 09:34:22 chris Exp $ */ /* * * IPX driver for native Linux TCP/IP networking (UDP implementation) @@ -535,7 +535,7 @@ static int ipx_udp_ReceivePacket(ipx_socket_t *s, char *outbuf, int outbufsize, struct ipx_recv_data *rd) { int size; struct sockaddr_in fromaddr; - int fromaddrsize=sizeof(fromaddr); + uint fromaddrsize=sizeof(fromaddr); unsigned short ports; size_t offs; int i; diff --git a/d2x.xcode/project.pbxproj b/d2x.xcode/project.pbxproj index 51daaaff..4cc328ad 100755 --- a/d2x.xcode/project.pbxproj +++ b/d2x.xcode/project.pbxproj @@ -778,7 +778,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = "$(HOME)/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; HEADER_SEARCH_PATHS = "$(HOME)/Library/Frameworks/SDL.framework/Headers $(HOME)/Library/Frameworks/physfs.framework/Headers"; INFOPLIST_FILE = "d2x-Info.plist"; INSTALL_PATH = "$(USER_APPS_DIR)"; @@ -2000,7 +2000,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = "$(HOME)/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "HAVE_CONFIG_H OGL"; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; HEADER_SEARCH_PATHS = "$(HOME)/Library/Frameworks/SDL.framework/Headers $(HOME)/Library/Frameworks/physfs.framework/Headers"; INFOPLIST_FILE = "d2xgl-Info.plist"; INSTALL_PATH = "$(USER_APPS_DIR)"; diff --git a/main/network.c b/main/network.c index 56a6fa76..4d0e582f 100644 --- a/main/network.c +++ b/main/network.c @@ -1,4 +1,4 @@ -/* $Id: network.c,v 1.28 2004-12-01 12:48:13 btb Exp $ */ +/* $Id: network.c,v 1.29 2005-07-21 09:35:50 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: network.c,v 1.28 2004-12-01 12:48:13 btb Exp $"; +static char rcsid[] = "$Id: network.c,v 1.29 2005-07-21 09:35:50 chris Exp $"; #endif #define PATCH12 @@ -232,7 +232,7 @@ void network_read_endlevel_packet(ubyte *data ); void network_read_endlevel_short_packet(ubyte *data ); void network_ping(ubyte flat, int pnum); void network_handle_ping_return(ubyte pnum); -void network_process_names_return(char *data); +void network_process_names_return(ubyte *data); void network_send_player_names(sequence_packet *their); int network_choose_connect(); void network_more_game_options(); @@ -244,7 +244,7 @@ void network_send_extras(); void network_read_pdata_packet(frame_info *pd); void network_read_pdata_short_packet(short_frame_info *pd); -void ClipRank(signed char *rank); +void ClipRank(ubyte *rank); void DoRefuseStuff(sequence_packet *their); int GetNewPlayerNumber(sequence_packet *their); void SetAllAllowablesTo(int on); @@ -1236,7 +1236,7 @@ void network_stop_resync(sequence_packet *their) } } -sbyte object_buffer[IPX_MAX_DATA_SIZE]; +ubyte object_buffer[IPX_MAX_DATA_SIZE]; void network_send_objects(void) { @@ -2503,7 +2503,7 @@ void network_process_packet(ubyte *data, int length ) break; case PID_NAMES_RETURN: if (Network_status==NETSTAT_BROWSING && NamesInfoSecurity!=-1) - network_process_names_return (data); + network_process_names_return ((ubyte *) data); break; case PID_GAME_PLAYERS: // Someone wants a list of players in this game @@ -6311,13 +6311,13 @@ int GetMyNetRanking () return (rank+1); } -void ClipRank (signed char *rank) +void ClipRank (ubyte *rank) { // This function insures no crashes when dealing with D2 1.0 - if (*rank<0 || *rank>9) - *rank=0; + if (*rank > 9) + *rank = 0; } void network_check_for_old_version (char pnum) { @@ -6334,7 +6334,7 @@ void network_request_player_names (int n) extern char already_showing_info; extern int newmenu_dotiny2( char * title, char * subtitle, int nitems, newmenu_item * item, void (*subfunction)(int nitems,newmenu_item * items, int * last_key, int citem)); -void network_process_names_return (char *data) +void network_process_names_return (ubyte *data) { newmenu_item m[15]; char mtext[15][50],temp[50]; diff --git a/main/network.h b/main/network.h index 3604c10a..847d580e 100644 --- a/main/network.h +++ b/main/network.h @@ -1,4 +1,4 @@ -/* $Id: network.h,v 1.13 2004-08-28 23:17:45 schaffner Exp $ */ +/* $Id: network.h,v 1.14 2005-07-21 09:36:08 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -84,7 +84,7 @@ typedef struct frame_info { ubyte playernum; ubyte obj_render_type; ubyte level_num; - ubyte data[NET_XDATA_SIZE]; // extra data to be tacked on the end + char data[NET_XDATA_SIZE]; // extra data to be tacked on the end } __pack__ frame_info; // short_frame_info is not aligned -- 01/18/96 -- MWA @@ -100,7 +100,7 @@ typedef struct short_frame_info { ubyte playernum; ubyte obj_render_type; ubyte level_num; - ubyte data[NET_XDATA_SIZE]; // extra data to be tacked on the end + char data[NET_XDATA_SIZE]; // extra data to be tacked on the end } __pack__ short_frame_info; void network_start_game(); diff --git a/main/newdemo.c b/main/newdemo.c index ff64a82c..88780948 100644 --- a/main/newdemo.c +++ b/main/newdemo.c @@ -1,4 +1,4 @@ -/* $Id: newdemo.c,v 1.20 2005-02-25 05:20:36 chris Exp $ */ +/* $Id: newdemo.c,v 1.21 2005-07-21 09:36:24 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1479,7 +1479,7 @@ int newdemo_read_demo_start(int rnd_demo) #ifdef NETWORK change_playernum_to((Newdemo_game_mode >> 16) & 0x7); if (Newdemo_game_mode & GM_TEAM) { - nd_read_byte(&(Netgame.team_vector)); + nd_read_byte((sbyte *) &(Netgame.team_vector)); nd_read_string(Netgame.team_name[0]); nd_read_string(Netgame.team_name[1]); } -- 2.39.2