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

removed unused branch and dummy function in pqihandler

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-06-17 09:07:45 +00:00
parent edf6b3e495
commit e5425f31dc
2 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libretroshare/src/pqi/pqihandler.cc
View File

@ -117,7 +117,7 @@ bool pqihandler::queueOutRsItem(RsItem *item)
RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
uint32_t size ; uint32_t size ;
locked_HandleRsItem(item, 0, size); locked_HandleRsItem(item, size);
#ifdef DEBUG_QOS #ifdef DEBUG_QOS
if(item->priority_level() == QOS_PRIORITY_UNKNOWN) if(item->priority_level() == QOS_PRIORITY_UNKNOWN)
@ -201,50 +201,14 @@ bool pqihandler::RemoveSearchModule(SearchModule *mod)
return false; return false;
} }
// dummy output check
int pqihandler::locked_checkOutgoingRsItem(RsItem * /*item*/, int /*global*/)
{
//pqioutput(PQL_DEBUG_BASIC, pqihandlerzone, "pqihandler::checkOutgoingPQItem() NULL fn");
return 1;
}
// generalised output // generalised output
int pqihandler::locked_HandleRsItem(RsItem *item, int allowglobal,uint32_t& computed_size) int pqihandler::locked_HandleRsItem(RsItem *item, uint32_t& computed_size)
{ {
computed_size = 0 ; computed_size = 0 ;
std::map<RsPeerId, SearchModule *>::iterator it; std::map<RsPeerId, SearchModule *>::iterator it;
pqioutput(PQL_DEBUG_BASIC, pqihandlerzone, pqioutput(PQL_DEBUG_BASIC, pqihandlerzone,
"pqihandler::HandleRsItem()"); "pqihandler::HandleRsItem()");
/* simplified to no global! */
if (allowglobal)
{
/* error */
std::string out = "pqihandler::HandleSearchItem() Cannot send out Global RsItem";
pqioutput(PQL_ALERT, pqihandlerzone, out);
#ifdef DEBUG_TICK
std::cerr << out << std::endl;
#endif
delete item;
return -1;
}
if (!locked_checkOutgoingRsItem(item, allowglobal))
{
std::string out = "pqihandler::HandleRsItem() checkOutgoingPQItem Failed on item: \n";
#ifdef DEBUG_TICK
std::cerr << out;
#endif
item -> print_string(out);
pqioutput(PQL_ALERT, pqihandlerzone, out);
delete item;
return -1;
}
pqioutput(PQL_DEBUG_BASIC, pqihandlerzone, pqioutput(PQL_DEBUG_BASIC, pqihandlerzone,
"pqihandler::HandleRsItem() Sending to One Channel"); "pqihandler::HandleRsItem() Sending to One Channel");
#ifdef DEBUG_TICK #ifdef DEBUG_TICK

3
libretroshare/src/pqi/pqihandler.h
View File

@ -85,10 +85,9 @@ class pqihandler: public P3Interface, public pqiPublisher
* generates warnings otherwise * generates warnings otherwise
*/ */
int locked_HandleRsItem(RsItem *ns, int allowglobal,uint32_t& size); int locked_HandleRsItem(RsItem *ns, uint32_t& size);
bool queueOutRsItem(RsItem *) ; bool queueOutRsItem(RsItem *) ;
virtual int locked_checkOutgoingRsItem(RsItem *item, int global);
#ifdef TO_BE_REMOVED #ifdef TO_BE_REMOVED
int locked_GetItems(); int locked_GetItems();
void locked_SortnStoreItem(RsItem *item); void locked_SortnStoreItem(RsItem *item);