Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

Browse Source
This commit is contained in:
Aleric Inglewood
2012-11-23 03:19:39 +01:00
parent 0f54e5fe46
commit 165bebda3e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmessage/aicurlthread.cpp
View File

@@ -1613,7 +1613,9 @@ CURLMcode MultiHandle::remove_easy_request(addedEasyRequests_type::iterator cons
ThreadSafeBufferedCurlEasyRequest* lockobj = iter->get_ptr().get(); ThreadSafeBufferedCurlEasyRequest* lockobj = iter->get_ptr().get();
#endif #endif
mAddedEasyRequests.erase(iter); mAddedEasyRequests.erase(iter);
#if CWDEBUG
Dout(dc::curl, "MultiHandle::remove_easy_request: Removed AICurlEasyRequest " << (void*)lockobj << "; now processing " << mAddedEasyRequests.size() << " easy handles."); Dout(dc::curl, "MultiHandle::remove_easy_request: Removed AICurlEasyRequest " << (void*)lockobj << "; now processing " << mAddedEasyRequests.size() << " easy handles.");
#endif
// Attempt to add a queued request, if any. // Attempt to add a queued request, if any.
PerHostRequestQueue_wat(*per_host)->add_queued_to(this); PerHostRequestQueue_wat(*per_host)->add_queued_to(this);
@@ -2361,10 +2363,10 @@ size_t BufferedCurlEasyRequest::curlHeaderCallback(char* data, size_t size, size
#if defined(CWDEBUG) || defined(DEBUG_CURLIO) #if defined(CWDEBUG) || defined(DEBUG_CURLIO)
int debug_callback(CURL*, curl_infotype infotype, char* buf, size_t size, void* user_ptr) int debug_callback(CURL*, curl_infotype infotype, char* buf, size_t size, void* user_ptr)
{ {
BufferedCurlEasyRequest* request = (BufferedCurlEasyRequest*)user_ptr;
#ifdef CWDEBUG #ifdef CWDEBUG
using namespace ::libcwd; using namespace ::libcwd;
BufferedCurlEasyRequest* request = (BufferedCurlEasyRequest*)user_ptr;
std::ostringstream marker; std::ostringstream marker;
marker << (void*)request->get_lockobj(); marker << (void*)request->get_lockobj();
libcw_do.push_marker(); libcw_do.push_marker();

4
indra/llmessage/debug_libcurl.cpp
View File

@@ -624,7 +624,7 @@ void debug_curl_easy_reset(CURL* handle)
CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...) CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...)
{ {
CURLcode ret; CURLcode ret = CURLE_UNKNOWN_OPTION; // Suppress compiler warning.
va_list ap; va_list ap;
union param_type { union param_type {
long along; long along;
@@ -841,7 +841,7 @@ CURLMcode debug_curl_multi_remove_handle(CURLM* multi_handle, CURL* easy_handle)
CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...) CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...)
{ {
CURLMcode ret; CURLMcode ret = CURLM_UNKNOWN_OPTION; // Suppress compiler warning.
va_list ap; va_list ap;
union param_type { union param_type {
long along; long along;

2
indra/llqtwebkit/llstyle.cpp
View File

@@ -71,7 +71,7 @@ void LLStyle::drawControl(ControlElement element, const QStyleOption *option, QP
QPlastiqueStyle::drawControl(element, &localOption, painter, widget); QPlastiqueStyle::drawControl(element, &localOption, painter, widget);
return; return;
} }
default:
break; break;
} }