Diff: tokyoMetro.cpp

Revision:

2:58e7fabcba89

Parent:

1:26a0a9220f01

Child:

4:acfd6fbf9f9e

--- a/tokyoMetro.cpp	Sat Jun 27 06:20:16 2015 +0000
+++ b/tokyoMetro.cpp	Sun Jun 28 00:16:16 2015 +0000
@@ -22,21 +22,23 @@
 #define ERR(x, ...) std::printf("[tokyoMetro : ERR]"x"\r\n", ##__VA_ARGS__);
 
 extern AlarmClock alarmclock ;
-static HTTPClient http;
+extern HTTPClient httpClient;
 
 static picojson::value trainStat ;
 
-void TMetro_query(const char *type, const char *query, char *recv, unsigned int size) {
+bool TMetro_query(const char *type, const char *query, char *recv, unsigned int size) {
     int ret ;
     #define BUFF_SIZE   256
     char queryBuff[BUFF_SIZE] ;
     sprintf(queryBuff, "%s/%s?rdf:type=%s&acl:consumerKey=%s", API_URL, type, query, ACCESS_TOKEN) ;
-    DBG(queryBuff) ;
-    ret = http.get(queryBuff, recv, size);
+    DBG("%s",queryBuff) ;
+    ret = httpClient.get(queryBuff, recv, size);
     if (!ret) {
         DBG("Result: %s\n", recv);
+        return true ;
     } else {
-        ERR("Error - ret = %d - HTTP return code = %d\n", ret, http.getHTTPResponseCode());
+        ERR("Error - ret = %d - HTTP return code = %d\n", ret, httpClient.getHTTPResponseCode());
+        return false ;
     }
 }