summaryrefslogtreecommitdiffstats
path: root/lib/Plugins/FileTransfer.cpp
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-12-14 15:19:37 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-12-14 15:19:37 +0100
commitf1d1a096c389b076007cda87c6e7db3172ed98db (patch)
tree26aa7ac4484c6f44322f717af45e2497e6800d55 /lib/Plugins/FileTransfer.cpp
parentb77941d725638702c3ca4d17bf97e0048d10f039 (diff)
downloadabrt-f1d1a096c389b076007cda87c6e7db3172ed98db.tar.gz
abrt-f1d1a096c389b076007cda87c6e7db3172ed98db.tar.xz
abrt-f1d1a096c389b076007cda87c6e7db3172ed98db.zip
get rid of ugly sleep call inside while()
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib/Plugins/FileTransfer.cpp')
-rw-r--r--lib/Plugins/FileTransfer.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp
index 03ee464..c98645c 100644
--- a/lib/Plugins/FileTransfer.cpp
+++ b/lib/Plugins/FileTransfer.cpp
@@ -68,9 +68,8 @@ void CFileTransfer::SendFile(const char *pURL, const char *pFilename)
string wholeURL = concat_path_file(pURL, pFilename);
- int result;
int count = m_nRetryCount;
- do
+ while (1)
{
FILE *f;
struct stat buf;
@@ -99,12 +98,14 @@ void CFileTransfer::SendFile(const char *pURL, const char *pFilename)
curl_easy_setopt(curl, CURLOPT_READDATA, f);
curl_easy_setopt(curl, CURLOPT_INFILESIZE, buf.st_size);
/* everything is done here; result 0 means success */
- result = curl_easy_perform(curl);
+ int result = curl_easy_perform(curl);
curl_easy_cleanup(curl);
fclose(f);
+ if (result == 0 || --count <= 0)
+ break;
+ /* retry the upload if not succesful, wait a bit before next try */
+ sleep(m_nRetryDelay);
}
- /*retry the upload if not succesful, wait a bit before next try*/
- while (result != 0 && --count >= 0 && (sleep(m_nRetryDelay), 1));
}
/*