Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified libretroshare to compile on Cygwin / MinGW.

Browse source 
* removed exceptions from serialiser (had troubles previously on win32).
 * Modified code in startup (enable CRYPTO structure) and rsdir.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1189 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-05-07 21:36:17 +00:00
parent deea89cbd0
commit 20593c9de2
7 changed files with 57 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libretroshare/src/serialiser/rsmsgitems.cc
View file

@ -97,21 +97,13 @@ RsItem *RsChatSerialiser::deserialise(void *data, uint32_t *pktsize)
return NULL; /* wrong type */
}
try
switch(getRsItemSubType(rstype))
{
switch(getRsItemSubType(rstype))
{
case RS_PKT_SUBTYPE_DEFAULT: return new RsChatMsgItem(data,*pktsize) ;
case RS_PKT_SUBTYPE_CHAT_STATUS: return new RsChatStatusItem(data,*pktsize) ;
default:
std::cerr << "Unknown packet type in chat!" << std::endl ;
return NULL ;
}
}
catch(std::exception& e)
{
std::cerr << "Exception raised: " << e.what() << std::endl ;
return NULL ;
case RS_PKT_SUBTYPE_DEFAULT: return new RsChatMsgItem(data,*pktsize) ;
case RS_PKT_SUBTYPE_CHAT_STATUS: return new RsChatStatusItem(data,*pktsize) ;
default:
std::cerr << "Unknown packet type in chat!" << std::endl ;
return NULL ;
}
}
@ -231,9 +223,9 @@ RsChatMsgItem::RsChatMsgItem(void *data,uint32_t size)
std::cerr << "Building new chat msg item." << std::endl ;
#endif
if (offset != rssize)
throw std::runtime_error("Size error while deserializing.") ;
std::cerr << "Size error while deserializing." << std::endl ;
if (!ok)
throw std::runtime_error("Unknown error while deserializing.") ;
std::cerr << "Unknown error while deserializing." << std::endl ;
}
RsChatStatusItem::RsChatStatusItem(void *data,uint32_t size)
@ -250,9 +242,9 @@ RsChatStatusItem::RsChatStatusItem(void *data,uint32_t size)
ok &= GetTlvString(data, rssize, &offset,TLV_TYPE_STR_MSG, status_string);
if (offset != rssize)
throw std::runtime_error("Size error while deserializing.") ;
std::cerr << "Size error while deserializing." << std::endl ;
if (!ok)
throw std::runtime_error("Unknown error while deserializing.") ;
std::cerr << "Unknown error while deserializing." << std::endl ;
}
/*************************************************************************/