Changeset 303

Show
Ignore:
Timestamp:
07/25/08 14:14:48 (3 months ago)
Author:
mattn
Message:

* fixed a warning and an error in the overflow check in l_net
* const stuff for GetNextChainItem? (bobtoolz)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • GtkRadiant/trunk/contrib/bobtoolz/misc.cpp

    r185 r303  
    5050} 
    5151 
    52 epair_t* GetNextChainItem(epair_t* lastItem, char* key, char* value) 
     52epair_t* GetNextChainItem(epair_t* lastItem, const char* key, const char* value) 
    5353{ 
    5454        epair_t* nextEPair = g_FuncTable.m_pfnAllocateEpair(key, value); 
    …… 
    260260        UnixToDosPath(exename); // do we want this done in linux version? 
    261261 
    262         char mapname[256];   
     262        char mapname[256]; 
    263263  const char *pn = g_FuncTable.m_pfnReadProjectKey("mapspath"); 
    264    
     264 
    265265        strcpy( mapname, pn ); 
    266266        strcat( mapname, "/ac_prt.map" ); 
    …… 
    280280 
    281281        DEntity world; 
    282          
     282 
    283283        char buffer[128]; 
    284284  const char *pn = g_FuncTable.m_pfnReadProjectKey("mapspath"); 

  • GtkRadiant/trunk/contrib/bobtoolz/misc.h

    r183 r303  
    2020vec_t Min(vec_t a, vec_t b); 
    2121 
    22 epair_t* GetNextChainItem(epair_t* lastItem, char* key, char* value); 
     22epair_t* GetNextChainItem(epair_t* lastItem, const char* key, const char* value); 
    2323 
    2424// reads current texture into global, returns pointer to it 

  • GtkRadiant/trunk/libs/l_net/l_net.c

    r250 r303  
    484484                return; 
    485485        } //end if 
    486         strcpy(&msg->data[msg->size], string); 
     486        memcpy(&msg->data[msg->size], string, strlen(string) + 1); 
    487487        msg->size += strlen(string) + 1; 
    488488} //end of the function NMSG_WriteString 
    …… 
    506506int NMSG_ReadChar(netmessage_t *msg) 
    507507{ 
    508         if (msg->size + 1 > msg->size) 
     508        if (msg->read + 1 > msg->size) 
    509509        { 
    510510                msg->readoverflow = qtrue; 
    …… 
    608608        static char     string[2048]; 
    609609        int l, c; 
    610          
     610 
    611611        l = 0; 
    612612        do