diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:24:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:24:55 +0000 |
| commit | 1ca02a673b39dc0cdfd58749c636bd079e59bbd8 (patch) | |
| tree | 210a8ac588d4a50fc3de64039154e2d2ed1e621f /ucb/source/ucp/ftp/ftploaderthread.cxx | |
| parent | 1f0585c2fcedf290627e2c9aa1a9327c26e436fa (diff) | |
INTEGRATION: CWS warnings01 (1.7.10); FILE MERGED
2006/03/10 15:40:13 sb 1.7.10.2: #i53898# Made code warning-free.
2005/11/10 15:32:58 pl 1.7.10.1: #i55991# removed warnings
Diffstat (limited to 'ucb/source/ucp/ftp/ftploaderthread.cxx')
| -rw-r--r-- | ucb/source/ucp/ftp/ftploaderthread.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx index 3ddfc48d1f89..6e849d004220 100644 --- a/ucb/source/ucp/ftp/ftploaderthread.cxx +++ b/ucb/source/ucp/ftp/ftploaderthread.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ftploaderthread.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 15:36:52 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:24:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,10 +41,7 @@ #ifndef _FTP_FTPLOADERTHREAD_HXX_ #include "ftploaderthread.hxx" #endif -#ifndef __CURL_CURL_H -#include <curl/curl.h> -#endif - +#include "curl.hxx" using namespace ftp; @@ -60,7 +57,7 @@ using namespace ftp; extern "C" { #endif - int memory_write_dummy(void *buffer,size_t size,size_t nmemb,void *stream) + int memory_write_dummy(void *,size_t,size_t,void *) { return 0; } @@ -100,8 +97,8 @@ FTPLoaderThread::~FTPLoaderThread() { CURL* FTPLoaderThread::handle() { - CURL* ret; - if(!(ret = osl_getThreadKeyData(m_threadKey))) { + CURL* ret = osl_getThreadKeyData(m_threadKey); + if(!ret) { ret = curl_easy_init(); if (ret != 0) { // Make sure curl is not internally using environment variables like |