diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-24 16:22:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-07-27 08:18:16 +0200 |
| commit | 38ecca9b30e0fc5f7cc6264857f983e40dd58195 (patch) | |
| tree | 3ad61e6d5cddcf161d27cfe4c6ca85fcf1cab8f6 /ucb/source/ucp/ftp/ftpurl.cxx | |
| parent | efac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5 (diff) | |
inline a bunch of use-once macros
no point in having a macro unless it's actually going to reduce the
number of lines of code
Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
Diffstat (limited to 'ucb/source/ucp/ftp/ftpurl.cxx')
| -rw-r--r-- | ucb/source/ucp/ftp/ftpurl.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 645236fca963..eff2b4232633 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -378,12 +378,6 @@ namespace ftp { &control) -#define SET_DATA_CONTAINER \ - curl_easy_setopt(curl,CURLOPT_NOBODY,false); \ - MemoryContainer data; \ - curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,memory_write); \ - curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data) - #define SET_URL(url) \ OString urlParAscii(url.getStr(), \ url.getLength(), \ @@ -439,7 +433,11 @@ std::vector<FTPDirentry> FTPURL::list( CURL *curl = m_pFCP->handle(); SET_CONTROL_CONTAINER; - SET_DATA_CONTAINER; + curl_easy_setopt(curl,CURLOPT_NOBODY,false); + MemoryContainer data; + curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,memory_write); + curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data); + OUString url(ident(true,true)); SET_URL(url); curl_easy_setopt(curl,CURLOPT_POSTQUOTE,0); |