libtransport.git Changeset - 712f03464f8d

Changeset - 712f03464f8d

Parent rev.

Child rev.

[Not reviewed]

Merge

0 19 0

HanzZ - 12 years ago 2013-02-22 09:59:24
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

3 files changed with 16 insertions and 4 deletions:

backends/swiften_raw/CMakeLists.txt

backends/twitter/TwitterResponseParser.cpp

backends/twitter/libtwitcurl/twitcurl.cpp

0 comments (0 inline, 0 general)

backends/swiften_raw/CMakeLists.txt

➞

Show inline comments

@@ @@ -10,5 +10,5 @@ else() @@
 target_link_libraries(spectrum2_swiften_raw_backend transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
 endif()
 INSTALL(TARGETS spectrum2_swiften_raw_backend RUNTIME DESTINATION bin)
+#INSTALL(TARGETS spectrum2_swiften_raw_backend RUNTIME DESTINATION bin)

backends/twitter/TwitterResponseParser.cpp

➞

Show inline comments

@@ @@ -137,11 +137,13 @@ std::vector<Status> getTimeline(std::string &xml) @@
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
         LOG4CXX_ERROR(logger, xml)
 		return statuses;
+	}
 	if(rootElement->getName() != "statuses") {
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to timeline")
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to timeline:")
         LOG4CXX_ERROR(logger, xml)
 		return statuses;
+	}
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
         LOG4CXX_ERROR(logger, xml)
 		return DMs;
+	}
 	if(rootElement->getName() != TwitterReponseTypes::directmessages) {
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to direct-messages")
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to direct-messages:")
         LOG4CXX_ERROR(logger, xml)
 		return DMs;
+	}
@@ @@ -187,11 +191,13 @@ std::vector<User> getUsers(std::string &xml) @@
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
         LOG4CXX_ERROR(logger, xml)
 		return users;
+	}
 	if(rootElement->getName() != TwitterReponseTypes::users) {
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to user list")
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to user list:")
         LOG4CXX_ERROR(logger, xml)
 		return users;
+	}
@@ @@ -212,11 +218,13 @@ User getUser(std::string &xml) @@
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
         LOG4CXX_ERROR(logger, xml)
 		return user;
+	}
 	if(rootElement->getName() != TwitterReponseTypes::user) {
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to user object")
         LOG4CXX_ERROR(logger, xml)
 		return user;
+	}
@@ @@ -231,11 +239,13 @@ std::vector<std::string> getIDs(std::string &xml) @@
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
         LOG4CXX_ERROR(logger, xml)
 		return IDs;
+	}
 	if(rootElement->getName() != TwitterReponseTypes::id_list) {
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to id_list");
         LOG4CXX_ERROR(logger, xml)
 		return IDs;
+	}
@@ @@ -258,6 +268,7 @@ Error getErrorMessage(std::string &xml) @@
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML");
         LOG4CXX_ERROR(logger, xml)
 		return resp;
+	}

backends/twitter/libtwitcurl/twitcurl.cpp

➞

Show inline comments

@@ @@ -41,6 +41,7 @@ m_eProtocolType( twitCurlTypes::eTwitCurlProtocolHttp ) @@
         getLastCurlError( dummyStr );
+    }
     curl_easy_setopt(m_curlHandle, CURLOPT_VERBOSE, 1);
     curl_easy_setopt(m_curlHandle, CURLOPT_FOLLOWLOCATION, 1);
 	curl_easy_setopt(m_curlHandle, CURLOPT_DEBUGFUNCTION, myDebugCallback);
+}

0 comments (0 inline, 0 general)