From 3543630b161ad79fed090beeb668a43f3b447637 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 24 Apr 2016 00:35:55 +0100 Subject: [PATCH] Moved resetting and result processing code in CalDAV::GetCalendars() --- source/objects/CalDAV/CalDAV.cpp | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/source/objects/CalDAV/CalDAV.cpp b/source/objects/CalDAV/CalDAV.cpp index 3d2e5de..a2bb856 100644 --- a/source/objects/CalDAV/CalDAV.cpp +++ b/source/objects/CalDAV/CalDAV.cpp @@ -511,17 +511,13 @@ CalDAVCalendarList CalDAV::GetCalendars(){ //ServerList = ProcessXMLCalendarList(); - // Restore the original settings. - - string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals"); - curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str()); - curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, NULL); - curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 0L); - curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL); - curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL); - - // Process the received XML data into a list of calendars - // and locations. + if (ServerResult == CURLE_OK){ + ConnectionServerResult.Result = CALDAVQUERYRESULT_OK; + } else { + ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR; + } + ConnectionServerResult.Code = ServerResult; + curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode); if (ServerResult != CURLE_OK){ @@ -529,8 +525,21 @@ CalDAVCalendarList CalDAV::GetCalendars(){ } + // Process the received XML data into a list of calendars + // and locations. + ServerList = ProcessXMLCalendarList(); + // Restore the original settings. + + string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals/"); + + curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str()); + curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, NULL); + curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 0L); + curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL); + curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL); + return ServerList; } -- 2.39.5