WiFiS3: unify codestyle and remove trailing spaces

Author: andreagilardoni

libraries/WiFiS3/src/WiFiClient.cpp

@@ -3,11 +3,11 @@
 using namespace std;
 
 /* -------------------------------------------------------------------------- */
-WiFiClient::WiFiClient() : _sock(-1), destroy_at_distructor(true), rx_buffer(nullptr) { 
+WiFiClient::WiFiClient() : _sock(-1), destroy_at_distructor(true), rx_buffer(nullptr) {
    rx_buffer = std::shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
 }
 /* -------------------------------------------------------------------------- */
-   
+
 /* -------------------------------------------------------------------------- */
 WiFiClient::WiFiClient(int s) : _sock(s), destroy_at_distructor(false), rx_buffer(nullptr) {
    rx_buffer = std::shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
@@ -18,9 +18,9 @@ WiFiClient::WiFiClient(int s) : _sock(s), destroy_at_distructor(false), rx_buffe
 WiFiClient::~WiFiClient() { }
 /* -------------------------------------------------------------------------- */
 
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
 WiFiClient::WiFiClient(const WiFiClient& c) {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    _sock = c._sock;
    rx_buffer = c.rx_buffer;
 }
@@ -34,7 +34,7 @@ void WiFiClient::getSocket() {
       if(modem.write(string(PROMPT(_BEGINCLIENT)),res, "%s" , CMD(_BEGINCLIENT))) {
          _sock = atoi(res.c_str());
       }
-   }   
+   }
 }
 
 /* -------------------------------------------------------------------------- */
@@ -45,7 +45,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port){
 
 /* -------------------------------------------------------------------------- */
 int WiFiClient::connect(const char *host, uint16_t port){
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    getSocket();
    if(_sock >= 0) {
       string res = "";
@@ -55,17 +55,18 @@ int WiFiClient::connect(const char *host, uint16_t port){
             return 1;
          }
       } else {
-      if(modem.write(string(PROMPT(_CLIENTCONNECTNAME)),res, "%s%d,%s,%d\r\n" , CMD_WRITE(_CLIENTCONNECTNAME), _sock, host,port)) {
-         return 1;
-      }  
+         if(modem.write(string(PROMPT(_CLIENTCONNECTNAME)),res, "%s%d,%s,%d\r\n" , CMD_WRITE(_CLIENTCONNECTNAME), _sock, host,port)) {
+            return 1;
+         }
       }
    }
+
    return 0;
 }
 
 /* -------------------------------------------------------------------------- */
 size_t WiFiClient::write(uint8_t b){
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    return write(&b, 1);
 }
 
@@ -79,15 +80,14 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size){
       if(modem.passthrough(buf,size)) {
          return size;
       }
-      
    }
    return 0;
 
 }
 
 /* -------------------------------------------------------------------------- */
 int WiFiClient::available() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    int rv = 0;
    if(_sock >= 0 && rx_buffer != nullptr) {
       if(rx_buffer->available() > 0) {
@@ -109,17 +109,17 @@ int WiFiClient::available() {
 
 /* -------------------------------------------------------------------------- */
 int WiFiClient::_read() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    int rv = -1;
    if(_sock >= 0 && rx_buffer != nullptr) {
       string res = "";
       uint32_t size = rx_buffer->freePositions() - 1;
       modem.begin();
-      
+
       /* important - it works one shot */
       modem.avoid_trim_results();
       modem.read_using_size();
-      
+
       if(modem.write(string(PROMPT(_CLIENTRECEIVE)),res, "%s%d,%d\r\n" , CMD_WRITE(_CLIENTRECEIVE), _sock, size)) {
          if(res.size() > 0) {
             for(int i = 0, rv = 0; i < size && i < res.size(); i++) {
@@ -133,11 +133,11 @@ int WiFiClient::_read() {
       }
    }
    return rv;
-}  
+}
 
 /* -------------------------------------------------------------------------- */
 void WiFiClient::read_if_needed(size_t s) {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    if(rx_buffer != nullptr) {
       if((size_t)rx_buffer->available() < s) {
          _read();
@@ -147,12 +147,12 @@ void WiFiClient::read_if_needed(size_t s) {
 
 /* -------------------------------------------------------------------------- */
 int WiFiClient::read() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    uint8_t b;
    if(read(&b, 1) == 1) {
       return b;
    }
-  return -1;
+   return -1;
 }
 
 /* -------------------------------------------------------------------------- */
@@ -173,27 +173,27 @@ int WiFiClient::read(uint8_t *buf, size_t size) {
          }
       }
    }
-   return rv; 
+   return rv;
 }
 
 /* -------------------------------------------------------------------------- */
 int WiFiClient::peek() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    int rv = -1;
    if(_sock >= 0) {
       string res = "";
       modem.begin();
       if(modem.write(string(PROMPT(_PEEK)),res, "%s%d\r\n" , CMD_WRITE(_PEEK), _sock)) {
          rv = atoi(res.c_str());
-      }  
+      }
    }
    return rv;
 }
 
 
 /* -------------------------------------------------------------------------- */
 void WiFiClient::flush() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    if(_sock >= 0) {
       string res = "";
       modem.begin();
@@ -203,7 +203,7 @@ void WiFiClient::flush() {
 
 /* -------------------------------------------------------------------------- */
 void WiFiClient::stop() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    if(_sock >= 0) {
       string res = "";
       modem.begin();
@@ -214,7 +214,7 @@ void WiFiClient::stop() {
 
 /* -------------------------------------------------------------------------- */
 uint8_t WiFiClient::connected() {
-/* -------------------------------------------------------------------------- */   
+/* -------------------------------------------------------------------------- */
    uint8_t rv = 0;
    if(this->available() > 0) {
       return 1;
@@ -224,16 +224,16 @@ uint8_t WiFiClient::connected() {
       modem.begin();
       if(modem.write(string(PROMPT(_CLIENTCONNECTED)),res, "%s%d\r\n" , CMD_WRITE(_CLIENTCONNECTED), _sock)) {
          rv = atoi(res.c_str());
-      }  
+      }
    }
+
    return rv;
 }
 
 /* -------------------------------------------------------------------------- */
-bool WiFiClient::operator==(const WiFiClient& whs)
-{
-    /* -------------------------------------------------------------------------- */
-    return _sock == whs._sock;
+bool WiFiClient::operator==(const WiFiClient& whs) {
+/* -------------------------------------------------------------------------- */
+   return _sock == whs._sock;
 }
 
 /* -------------------------------------------------------------------------- */
@@ -246,22 +246,22 @@ IPAddress WiFiClient::remoteIP() {
       if(modem.write(string(PROMPT(_REMOTEIP)),res, "%s%d\r\n" , CMD_WRITE(_REMOTEIP), _sock)) {
          ip.fromString(res.c_str());
          return ip;
-      }  
+      }
    }
    return IPAddress(0,0,0,0);
 }
 
 /* -------------------------------------------------------------------------- */
 uint16_t WiFiClient::remotePort(){
-/* -------------------------------------------------------------------------- */  
+/* -------------------------------------------------------------------------- */
    uint16_t rv = 0;
    if(_sock >= 0) {
       string res = "";
       modem.begin();
       if(modem.write(string(PROMPT(_REMOTEPORT)),res, "%s%d\r\n" , CMD_WRITE(_REMOTEPORT), _sock)) {
          rv = atoi(res.c_str());
          return rv;
-      }  
+      }
    }
-   return rv; 
+   return rv;
 }

libraries/WiFiS3/src/WiFiClient.h

@@ -67,7 +67,7 @@ class WiFiClient : public Client {
   }
 
   friend class WiFiServer;
-  
+
   using Print::write;
 
 protected: