ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

locallist return code vars, they don't need to be class members

pull/2077/head
Isaac Connor 2017-12-12 12:35:54 -05:00
parent a0f79b7bf7
commit 16ac341642
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_curl_camera.cpp
View File

@ -57,7 +57,7 @@ void cURLCamera::Initialise() {
databuffer.expand(CURL_BUFFER_INITIAL_SIZE); databuffer.expand(CURL_BUFFER_INITIAL_SIZE);
/* cURL initialization */ /* cURL initialization */
cRet = curl_global_init(CURL_GLOBAL_ALL); CURLcode cRet = curl_global_init(CURL_GLOBAL_ALL);
if(cRet != CURLE_OK) { if(cRet != CURLE_OK) {
Fatal("libcurl initialization failed: ", curl_easy_strerror(cRet)); Fatal("libcurl initialization failed: ", curl_easy_strerror(cRet));
} }
@ -65,7 +65,7 @@ void cURLCamera::Initialise() {
Debug(2,"libcurl version: %s",curl_version()); Debug(2,"libcurl version: %s",curl_version());
/* Create the shared data mutex */ /* Create the shared data mutex */
nRet = pthread_mutex_init(&shareddata_mutex, NULL); int nRet = pthread_mutex_init(&shareddata_mutex, NULL);
if(nRet != 0) { if(nRet != 0) {
Fatal("Shared data mutex creation failed: %s",strerror(nRet)); Fatal("Shared data mutex creation failed: %s",strerror(nRet));
} }
@ -124,6 +124,7 @@ int cURLCamera::Capture( Image &image ) {
unsigned int frame_content_length = 0; unsigned int frame_content_length = 0;
std::string frame_content_type; std::string frame_content_type;
bool need_more_data = false; bool need_more_data = false;
int nRet;
/* Grab the mutex to ensure exclusive access to the shared data */ /* Grab the mutex to ensure exclusive access to the shared data */
lock(); lock();
@ -318,7 +319,7 @@ size_t cURLCamera::data_callback(void *buffer, size_t size, size_t nmemb, void *
databuffer.append((const char*)buffer, size*nmemb); databuffer.append((const char*)buffer, size*nmemb);
/* Signal data available */ /* Signal data available */
nRet = pthread_cond_signal(&data_available_cond); int nRet = pthread_cond_signal(&data_available_cond);
if(nRet != 0) { if(nRet != 0) {
Error("Failed signaling data available condition variable: %s",strerror(nRet)); Error("Failed signaling data available condition variable: %s",strerror(nRet));
return -16; return -16;
@ -379,6 +380,7 @@ void* cURLCamera::thread_func() {
Fatal("Failed getting easy handle from libcurl"); Fatal("Failed getting easy handle from libcurl");
} }
CURLcode cRet;
/* Set URL */ /* Set URL */
cRet = curl_easy_setopt(c, CURLOPT_URL, mPath.c_str()); cRet = curl_easy_setopt(c, CURLOPT_URL, mPath.c_str());
if(cRet != CURLE_OK) if(cRet != CURLE_OK)

4
src/zm_curl_camera.h
View File

@ -88,10 +88,6 @@ public:
int lock(); int lock();
int unlock(); int unlock();
private:
int nRet;
CURLcode cRet;
}; };
/* Dispatchers */ /* Dispatchers */