From: Kenny G. <ken...@us...> - 2007-04-30 01:43:18
|
Update of /cvsroot/planeshift/planeshift/src/common/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32340/src/common/net Modified Files: charmessages.cpp messages.cpp netbase.cpp npcmessages.cpp Log Message: - Fix over 90 simple compile warnings. Index: charmessages.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/charmessages.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** charmessages.cpp 9 Feb 2007 21:50:25 -0000 1.30 --- charmessages.cpp 30 Apr 2007 01:42:43 -0000 1.31 *************** *** 147,151 **** { Attribute a = stats[z]; ! msgtext.AppendFmt(" %d('%s',%d)",z,a.name.GetDataSafe(),a.value); } msgtext.AppendFmt(" Skills:"); --- 147,151 ---- { Attribute a = stats[z]; ! msgtext.AppendFmt(" %zu('%s',%d)",z,a.name.GetDataSafe(),a.value); } msgtext.AppendFmt(" Skills:"); *************** *** 153,157 **** { Attribute a = skills[z]; ! msgtext.AppendFmt(" %d('%s',%d)",z,a.name.GetDataSafe(),a.value); } --- 153,157 ---- { Attribute a = skills[z]; ! msgtext.AppendFmt(" %zu('%s',%d)",z,a.name.GetDataSafe(),a.value); } *************** *** 392,396 **** for ( size_t x = 0; x < choices.GetSize(); x++ ) { ! msgtext.AppendFmt(" %d(Id: %d Name: '%s'" " Descr: '%s' Area: %d CPCost: %d)", x,choices[x].id, --- 392,396 ---- for ( size_t x = 0; x < choices.GetSize(); x++ ) { ! msgtext.AppendFmt(" %zu(Id: %d Name: '%s'" " Descr: '%s' Area: %d CPCost: %d)", x,choices[x].id, *************** *** 517,521 **** { LifeEventChoice *choice = choices[x]; ! msgtext.AppendFmt(" %d(Id: %d Name: '%s'" " Descr: '%s' Common: %d CPCost: %d Adds:", x,choice->id, --- 517,521 ---- { LifeEventChoice *choice = choices[x]; ! msgtext.AppendFmt(" %zu(Id: %d Name: '%s'" " Descr: '%s' Common: %d CPCost: %d Adds:", x,choice->id, Index: messages.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v retrieving revision 1.456 retrieving revision 1.457 diff -C2 -d -r1.456 -r1.457 *** messages.cpp 26 Apr 2007 08:24:25 -0000 1.456 --- messages.cpp 30 Apr 2007 01:42:43 -0000 1.457 *************** *** 702,706 **** psPetitionInfo current = petitions[i]; ! msgtext.AppendFmt(" %d(ID: %d Petition: '%s' Status: '%s'", i,current.id,current.petition.GetDataSafe(), current.status.GetDataSafe()); --- 702,706 ---- psPetitionInfo current = petitions[i]; ! msgtext.AppendFmt(" %zu(ID: %d Petition: '%s' Status: '%s'", i,current.id,current.petition.GetDataSafe(), current.status.GetDataSafe()); *************** *** 831,835 **** { PlayerInfo p = players[i]; ! msgtext.AppendFmt(" %d(Name: '%s' Last: '%s'" " Gender: %d Guild: '%s'" " Sector: '%s')",i, --- 831,835 ---- { PlayerInfo p = players[i]; ! msgtext.AppendFmt(" %zu(Name: '%s' Last: '%s'" " Gender: %d Guild: '%s'" " Sector: '%s')",i, *************** *** 2728,2732 **** if (command == LIST || command == UPDATE_LIST) { ! msgtext.AppendFmt(" Total Items: %d Max Weight: %.3f", totalItems, maxWeight); msgtext.AppendFmt(" List: "); --- 2728,2732 ---- if (command == LIST || command == UPDATE_LIST) { ! msgtext.AppendFmt(" Total Items: %zu Max Weight: %.3f", totalItems, maxWeight); msgtext.AppendFmt(" List: "); *************** *** 2747,2751 **** if (command == UPDATE_LIST) { ! msgtext.AppendFmt(" Total Emptied Slots: %d", totalEmptiedSlots); #ifdef FULL_DEBUG_DUMP --- 2747,2751 ---- if (command == UPDATE_LIST) { ! msgtext.AppendFmt(" Total Emptied Slots: %zu", totalEmptiedSlots); #ifdef FULL_DEBUG_DUMP *************** *** 3541,3545 **** for ( size_t x = 0; x < glyphs.GetSize(); x++ ) { ! msgtext.AppendFmt("Name: '%s' Image: '%s' Count: %d Purified Status: %d Way: %d Stat Id: %d; ", glyphs[x].name.GetDataSafe(), glyphs[x].image.GetDataSafe(), --- 3541,3545 ---- for ( size_t x = 0; x < glyphs.GetSize(); x++ ) { ! msgtext.AppendFmt("Name: '%s' Image: '%s' Purified Status: %d Way: %d Stat Id: %d; ", glyphs[x].name.GetDataSafe(), glyphs[x].image.GetDataSafe(), *************** *** 4002,4006 **** csString msgtext; ! msgtext.AppendFmt("Event Type: %d Attack Anim: %d Defense Anim: %d Attacker: %d Target: %d Location: %d", event_type, attack_anim, defense_anim, attacker_id, target_id, target_location); if (event_type == COMBAT_DAMAGE) --- 4002,4006 ---- csString msgtext; ! msgtext.AppendFmt("Event Type: %d Attack Anim: %zu Defense Anim: %zu Attacker: %d Target: %d Location: %d", event_type, attack_anim, defense_anim, attacker_id, target_id, target_location); if (event_type == COMBAT_DAMAGE) *************** *** 4954,4958 **** msgtext.AppendFmt("DR: %s ", psDRMessage::ToString(access_ptrs).GetData() ); msgtext.AppendFmt(" Type: %d",type); ! msgtext.AppendFmt(" Control: ",(control?"true":"false")); msgtext.AppendFmt(" Name: '%s'",name.GetDataSafe()); msgtext.AppendFmt(" Guild: '%s'",guild.GetDataSafe()); --- 4954,4958 ---- msgtext.AppendFmt("DR: %s ", psDRMessage::ToString(access_ptrs).GetData() ); msgtext.AppendFmt(" Type: %d",type); ! msgtext.AppendFmt(" Control: %s",(control?"true":"false")); msgtext.AppendFmt(" Name: '%s'",name.GetDataSafe()); msgtext.AppendFmt(" Guild: '%s'",guild.GetDataSafe()); *************** *** 5276,5280 **** size_t numCategories = categoryList.GetSize(); ! msgtext.AppendFmt("Window: %s Command: %d Categories: %d ", (openWindow ? "open" : "closed"), command, numCategories); for (size_t i = 0; i < numCategories; i++) --- 5276,5280 ---- size_t numCategories = categoryList.GetSize(); ! msgtext.AppendFmt("Window: %s Command: %d Categories: %zu ", (openWindow ? "open" : "closed"), command, numCategories); for (size_t i = 0; i < numCategories; i++) *************** *** 6680,6684 **** { csString msgtext; ! msgtext.Format("%u modes and %u moves",modes,moves); return msgtext; } --- 6680,6684 ---- { csString msgtext; ! msgtext.Format("%zu modes and %zu moves",modes,moves); return msgtext; } Index: netbase.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/netbase.cpp,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** netbase.cpp 9 Apr 2007 05:23:20 -0000 1.168 --- netbase.cpp 30 Apr 2007 01:42:43 -0000 1.169 *************** *** 204,208 **** if (connection) { ! Debug4(LOG_NET,connection->clientnum,"Too long packet received from client %d (%d bytes received, header reports %d bytes)\n", connection->clientnum,packetlen,bufpacket->GetPacketSize()); } --- 204,208 ---- if (connection) { ! Debug4(LOG_NET,connection->clientnum,"Too long packet received from client %d (%d bytes received, header reports %zu bytes)\n", connection->clientnum,packetlen,bufpacket->GetPacketSize()); } *************** *** 211,215 **** unsigned char *ip_bytes=(unsigned char *)(&(addr.sin_addr)); pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__,CS_REPORTER_SEVERITY_DEBUG, LOG_NET, ! connection->clientnum,"Too long packet received from IP address %d.%d.%d.%d. (%d bytes received, header reports %d bytes) No existing connection from this IP.\n", (int)ip_bytes[0],(int)ip_bytes[1],(int)ip_bytes[2],(int)ip_bytes[3],packetlen,bufpacket->GetPacketSize()); } --- 211,215 ---- unsigned char *ip_bytes=(unsigned char *)(&(addr.sin_addr)); pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__,CS_REPORTER_SEVERITY_DEBUG, LOG_NET, ! connection->clientnum,"Too long packet received from IP address %d.%d.%d.%d. (%d bytes received, header reports %zu bytes) No existing connection from this IP.\n", (int)ip_bytes[0],(int)ip_bytes[1],(int)ip_bytes[2],(int)ip_bytes[3],packetlen,bufpacket->GetPacketSize()); } *************** *** 928,932 **** if (packet->msgsize != msg->GetTotalSize()) { ! Debug3(LOG_NET,connection ? connection->clientnum : 0, "Dropping packet with different message size in packet header (%d) and message header (%d).\n", packet->msgsize,msg->GetTotalSize()); } --- 928,932 ---- if (packet->msgsize != msg->GetTotalSize()) { ! Debug3(LOG_NET,connection ? connection->clientnum : 0, "Dropping packet with different message size in packet header (%d) and message header (%zu).\n", packet->msgsize,msg->GetTotalSize()); } *************** *** 1104,1108 **** if (!inqueues[i]->Add(me)) { ! Error4("*** Input Buffer Full! Yielding for packet, client %u, type %s, input queue %i!", me->clientnum,GetMsgTypeName(me->GetType()).GetData(),i); --- 1104,1108 ---- if (!inqueues[i]->Add(me)) { ! Error4("*** Input Buffer Full! Yielding for packet, client %u, type %s, input queue %zu!", me->clientnum,GetMsgTypeName(me->GetType()).GetData(),i); *************** *** 1112,1116 **** if (!inqueues[i]->Add(me)) { ! Error4("*** Input Buffer Full! Yielding for packet, client %u, type %s, input queue %i!", me->clientnum,GetMsgTypeName(me->GetType()).GetData(),i); } --- 1112,1116 ---- if (!inqueues[i]->Add(me)) { ! Error4("*** Input Buffer Full! Yielding for packet, client %u, type %s, input queue %zu!", me->clientnum,GetMsgTypeName(me->GetType()).GetData(),i); } Index: npcmessages.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/npcmessages.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** npcmessages.cpp 23 Feb 2007 21:06:04 -0000 1.48 --- npcmessages.cpp 30 Apr 2007 01:42:43 -0000 1.49 *************** *** 132,136 **** for (size_t c = 0; c < map.GetSize(); c++) { ! msgtext.AppendFmt(" %d: '%s'",c,map[c].GetDataSafe()); } --- 132,136 ---- for (size_t c = 0; c < map.GetSize(); c++) { ! msgtext.AppendFmt(" %zu: '%s'",c,map[c].GetDataSafe()); } *************** *** 760,764 **** csString msgtext; ! msgtext.AppendFmt("Command: %",command); msgtext.AppendFmt("Target: '%s'",target.GetDataSafe()); msgtext.AppendFmt("Options: '%s'",options.GetDataSafe()); --- 760,764 ---- csString msgtext; ! msgtext.AppendFmt("Command: %d",command); msgtext.AppendFmt("Target: '%s'",target.GetDataSafe()); msgtext.AppendFmt("Options: '%s'",options.GetDataSafe()); |