Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 996cc5e

Browse files
andreagilardonifacchinm
authored andcommitted
WiFiS3: unify codestyle and remove trailing spaces
1 parent 141018d commit 996cc5e

File tree

4 files changed

+61
-61
lines changed

4 files changed

+61
-61
lines changed

‎libraries/WiFiS3/src/WiFiClient.cpp‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using namespace std;
44

55
/* -------------------------------------------------------------------------- */
6-
WiFiClient::WiFiClient() : _sock(-1), destroy_at_distructor(true), rx_buffer(nullptr) {
6+
WiFiClient::WiFiClient() : _sock(-1), destroy_at_distructor(true), rx_buffer(nullptr) {
77
rx_buffer = std::shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>>(new FifoBuffer<uint8_t,RX_BUFFER_DIM>());
88
}
99
/* -------------------------------------------------------------------------- */
10-
10+
1111
/* -------------------------------------------------------------------------- */
1212
WiFiClient::WiFiClient(int s) : _sock(s), destroy_at_distructor(false), rx_buffer(nullptr) {
1313
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
1818
WiFiClient::~WiFiClient() { }
1919
/* -------------------------------------------------------------------------- */
2020

21-
/* -------------------------------------------------------------------------- */
21+
/* -------------------------------------------------------------------------- */
2222
WiFiClient::WiFiClient(const WiFiClient& c) {
23-
/* -------------------------------------------------------------------------- */
23+
/* -------------------------------------------------------------------------- */
2424
_sock = c._sock;
2525
rx_buffer = c.rx_buffer;
2626
}
@@ -34,7 +34,7 @@ void WiFiClient::getSocket() {
3434
if(modem.write(string(PROMPT(_BEGINCLIENT)),res, "%s" , CMD(_BEGINCLIENT))) {
3535
_sock = atoi(res.c_str());
3636
}
37-
}
37+
}
3838
}
3939

4040
/* -------------------------------------------------------------------------- */
@@ -45,7 +45,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port){
4545

4646
/* -------------------------------------------------------------------------- */
4747
int WiFiClient::connect(const char *host, uint16_t port){
48-
/* -------------------------------------------------------------------------- */
48+
/* -------------------------------------------------------------------------- */
4949
getSocket();
5050
if(_sock >= 0) {
5151
string res = "";
@@ -55,17 +55,18 @@ int WiFiClient::connect(const char *host, uint16_t port){
5555
return 1;
5656
}
5757
} else {
58-
if(modem.write(string(PROMPT(_CLIENTCONNECTNAME)),res, "%s%d,%s,%d\r\n" , CMD_WRITE(_CLIENTCONNECTNAME), _sock, host,port)) {
59-
return 1;
60-
}
58+
if(modem.write(string(PROMPT(_CLIENTCONNECTNAME)),res, "%s%d,%s,%d\r\n" , CMD_WRITE(_CLIENTCONNECTNAME), _sock, host,port)) {
59+
return 1;
60+
}
6161
}
6262
}
63+
6364
return 0;
6465
}
6566

6667
/* -------------------------------------------------------------------------- */
6768
size_t WiFiClient::write(uint8_t b){
68-
/* -------------------------------------------------------------------------- */
69+
/* -------------------------------------------------------------------------- */
6970
return write(&b, 1);
7071
}
7172

@@ -79,15 +80,14 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size){
7980
if(modem.passthrough(buf,size)) {
8081
return size;
8182
}
82-
8383
}
8484
return 0;
8585

8686
}
8787

8888
/* -------------------------------------------------------------------------- */
8989
int WiFiClient::available() {
90-
/* -------------------------------------------------------------------------- */
90+
/* -------------------------------------------------------------------------- */
9191
int rv = 0;
9292
if(_sock >= 0 && rx_buffer != nullptr) {
9393
if(rx_buffer->available() > 0) {
@@ -109,17 +109,17 @@ int WiFiClient::available() {
109109

110110
/* -------------------------------------------------------------------------- */
111111
int WiFiClient::_read() {
112-
/* -------------------------------------------------------------------------- */
112+
/* -------------------------------------------------------------------------- */
113113
int rv = -1;
114114
if(_sock >= 0 && rx_buffer != nullptr) {
115115
string res = "";
116116
uint32_t size = rx_buffer->freePositions() - 1;
117117
modem.begin();
118-
118+
119119
/* important - it works one shot */
120120
modem.avoid_trim_results();
121121
modem.read_using_size();
122-
122+
123123
if(modem.write(string(PROMPT(_CLIENTRECEIVE)),res, "%s%d,%d\r\n" , CMD_WRITE(_CLIENTRECEIVE), _sock, size)) {
124124
if(res.size() > 0) {
125125
for(int i = 0, rv = 0; i < size && i < res.size(); i++) {
@@ -133,11 +133,11 @@ int WiFiClient::_read() {
133133
}
134134
}
135135
return rv;
136-
}
136+
}
137137

138138
/* -------------------------------------------------------------------------- */
139139
void WiFiClient::read_if_needed(size_t s) {
140-
/* -------------------------------------------------------------------------- */
140+
/* -------------------------------------------------------------------------- */
141141
if(rx_buffer != nullptr) {
142142
if((size_t)rx_buffer->available() < s) {
143143
_read();
@@ -147,12 +147,12 @@ void WiFiClient::read_if_needed(size_t s) {
147147

148148
/* -------------------------------------------------------------------------- */
149149
int WiFiClient::read() {
150-
/* -------------------------------------------------------------------------- */
150+
/* -------------------------------------------------------------------------- */
151151
uint8_t b;
152152
if(read(&b, 1) == 1) {
153153
return b;
154154
}
155-
return -1;
155+
return -1;
156156
}
157157

158158
/* -------------------------------------------------------------------------- */
@@ -173,27 +173,27 @@ int WiFiClient::read(uint8_t *buf, size_t size) {
173173
}
174174
}
175175
}
176-
return rv;
176+
return rv;
177177
}
178178

179179
/* -------------------------------------------------------------------------- */
180180
int WiFiClient::peek() {
181-
/* -------------------------------------------------------------------------- */
181+
/* -------------------------------------------------------------------------- */
182182
int rv = -1;
183183
if(_sock >= 0) {
184184
string res = "";
185185
modem.begin();
186186
if(modem.write(string(PROMPT(_PEEK)),res, "%s%d\r\n" , CMD_WRITE(_PEEK), _sock)) {
187187
rv = atoi(res.c_str());
188-
}
188+
}
189189
}
190190
return rv;
191191
}
192192

193193

194194
/* -------------------------------------------------------------------------- */
195195
void WiFiClient::flush() {
196-
/* -------------------------------------------------------------------------- */
196+
/* -------------------------------------------------------------------------- */
197197
if(_sock >= 0) {
198198
string res = "";
199199
modem.begin();
@@ -203,7 +203,7 @@ void WiFiClient::flush() {
203203

204204
/* -------------------------------------------------------------------------- */
205205
void WiFiClient::stop() {
206-
/* -------------------------------------------------------------------------- */
206+
/* -------------------------------------------------------------------------- */
207207
if(_sock >= 0) {
208208
string res = "";
209209
modem.begin();
@@ -214,7 +214,7 @@ void WiFiClient::stop() {
214214

215215
/* -------------------------------------------------------------------------- */
216216
uint8_t WiFiClient::connected() {
217-
/* -------------------------------------------------------------------------- */
217+
/* -------------------------------------------------------------------------- */
218218
uint8_t rv = 0;
219219
if(this->available() > 0) {
220220
return 1;
@@ -224,16 +224,16 @@ uint8_t WiFiClient::connected() {
224224
modem.begin();
225225
if(modem.write(string(PROMPT(_CLIENTCONNECTED)),res, "%s%d\r\n" , CMD_WRITE(_CLIENTCONNECTED), _sock)) {
226226
rv = atoi(res.c_str());
227-
}
227+
}
228228
}
229+
229230
return rv;
230231
}
231232

232233
/* -------------------------------------------------------------------------- */
233-
bool WiFiClient::operator==(const WiFiClient& whs)
234-
{
235-
/* -------------------------------------------------------------------------- */
236-
return _sock == whs._sock;
234+
bool WiFiClient::operator==(const WiFiClient& whs) {
235+
/* -------------------------------------------------------------------------- */
236+
return _sock == whs._sock;
237237
}
238238

239239
/* -------------------------------------------------------------------------- */
@@ -246,22 +246,22 @@ IPAddress WiFiClient::remoteIP() {
246246
if(modem.write(string(PROMPT(_REMOTEIP)),res, "%s%d\r\n" , CMD_WRITE(_REMOTEIP), _sock)) {
247247
ip.fromString(res.c_str());
248248
return ip;
249-
}
249+
}
250250
}
251251
return IPAddress(0,0,0,0);
252252
}
253253

254254
/* -------------------------------------------------------------------------- */
255255
uint16_t WiFiClient::remotePort(){
256-
/* -------------------------------------------------------------------------- */
256+
/* -------------------------------------------------------------------------- */
257257
uint16_t rv = 0;
258258
if(_sock >= 0) {
259259
string res = "";
260260
modem.begin();
261261
if(modem.write(string(PROMPT(_REMOTEPORT)),res, "%s%d\r\n" , CMD_WRITE(_REMOTEPORT), _sock)) {
262262
rv = atoi(res.c_str());
263263
return rv;
264-
}
264+
}
265265
}
266-
return rv;
266+
return rv;
267267
}

‎libraries/WiFiS3/src/WiFiClient.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class WiFiClient : public Client {
6767
}
6868

6969
friend class WiFiServer;
70-
70+
7171
using Print::write;
7272

7373
protected:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /