Skip to content

Commit d77666c

Browse files
532910TerryE
authored andcommitted
trailing spaces cleanup (#2659)
1 parent d758304 commit d77666c

File tree

380 files changed

+37117
-37117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+37117
-37117
lines changed

.gdbinit

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#
2-
# This is very much a work in progress to show how we can use macros to make the
3-
# GDB interface a lot more useable. For example the next / step commands only
4-
# work if the stepper doesn't leave the current scope. Beyond that you have a
5-
# single hardware breakpoint which can be used as an hb or a wa. You have to
6-
# remember to delete the previous one, so the br macro does this for you.
2+
# This is very much a work in progress to show how we can use macros to make the
3+
# GDB interface a lot more useable. For example the next / step commands only
4+
# work if the stepper doesn't leave the current scope. Beyond that you have a
5+
# single hardware breakpoint which can be used as an hb or a wa. You have to
6+
# remember to delete the previous one, so the br macro does this for you.
77
#
88
file app/.output/eagle/debug/image/eagle.app.v6.out
99
#set remotedebug 1
@@ -16,12 +16,12 @@ target remote /dev/ttyUSB0
1616

1717
set confirm off
1818
set print null-stop
19-
define br
19+
define br
2020
d
2121
hb $arg0
2222
end
2323

24-
define upto
24+
define upto
2525
d
2626
hb $arg0
2727
c

.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Provide a [Minimal, Complete, and Verifiable example](http://stackoverflow.com/h
1515
Which branch are you on? If you know the Git revision then add it here as well.
1616

1717
### Hardware
18-
Describe which ESP8266 device you use and document any special hardware setup
18+
Describe which ESP8266 device you use and document any special hardware setup
1919
required to reproduce the problem.
2020

2121
8<------------------------ END BUG REPORT -------------------------------------

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Avoid intermediate merge commits. [Rebase](https://www.atlassian.com/git/tutoria
6565

6666
This is just one way of doing things. If you're proficient in Git matters you're free to choose your own. If you want to read more then the [GitHub chapter in the Git book](http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project#The-GitHub-Flow) is a way to start. [GitHub's own documentation](https://help.github.com/categories/collaborating-with-issues-and-pull-requests/) contains a wealth of information as well.
6767

68-
As a Windows or Mac user you could also resort to [GitHub Desktop](https://desktop.github.com/). It's a mature GUI application that supports most of the tasks outlined above.
68+
As a Windows or Mac user you could also resort to [GitHub Desktop](https://desktop.github.com/). It's a mature GUI application that supports most of the tasks outlined above.
6969

7070
### Keeping your fork in sync
7171
You need to sync your fork with the NodeMCU upstream repository from time to time, latest before you rebase (see flow above).

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ wifi.sta.config{ssid="SSID", pwd="password"}
4646

4747
# Documentation
4848

49-
The entire [NodeMCU documentation](https://nodemcu.readthedocs.io) is maintained right in this repository at [/docs](docs). The fact that the API documentation is maintained in the same repository as the code that *provides* the API ensures consistency between the two. With every commit the documentation is rebuilt by Read the Docs and thus transformed from terse Markdown into a nicely browsable HTML site at [https://nodemcu.readthedocs.io](https://nodemcu.readthedocs.io).
49+
The entire [NodeMCU documentation](https://nodemcu.readthedocs.io) is maintained right in this repository at [/docs](docs). The fact that the API documentation is maintained in the same repository as the code that *provides* the API ensures consistency between the two. With every commit the documentation is rebuilt by Read the Docs and thus transformed from terse Markdown into a nicely browsable HTML site at [https://nodemcu.readthedocs.io](https://nodemcu.readthedocs.io).
5050

5151
- How to [build the firmware](https://nodemcu.readthedocs.io/en/master/en/build/)
5252
- How to [flash the firmware](https://nodemcu.readthedocs.io/en/master/en/flash/)

app/coap/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif
2222
# makefile at its root level - these are then overridden
2323
# for a subtree within the makefile rooted therein
2424
#
25-
#DEFINES +=
25+
#DEFINES +=
2626

2727
#############################################################
2828
# Recursion Magic - Don't touch this!!

app/coap/coap.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ typedef struct
2424
uint8_t ver; /* CoAP version number */
2525
uint8_t t; /* CoAP Message Type */
2626
uint8_t tkl; /* Token length: indicates length of the Token field */
27-
uint8_t code; /* CoAP status code. Can be request (0.xx), success reponse (2.xx),
28-
* client error response (4.xx), or rever error response (5.xx)
27+
uint8_t code; /* CoAP status code. Can be request (0.xx), success reponse (2.xx),
28+
* client error response (4.xx), or rever error response (5.xx)
2929
* For possible values, see http://tools.ietf.org/html/rfc7252#section-12.1 */
3030
uint8_t id[2];
3131
} coap_header_t;
@@ -164,14 +164,14 @@ struct coap_luser_entry{
164164

165165
struct coap_endpoint_t{
166166
coap_method_t method; /* (i.e. POST, PUT or GET) */
167-
coap_endpoint_func handler; /* callback function which handles this
168-
* type of endpoint (and calls
167+
coap_endpoint_func handler; /* callback function which handles this
168+
* type of endpoint (and calls
169169
* coap_make_response() at some point) */
170-
const coap_endpoint_path_t *path; /* path towards a resource (i.e. foo/bar/) */
170+
const coap_endpoint_path_t *path; /* path towards a resource (i.e. foo/bar/) */
171171
const char *core_attr; /* the 'ct' attribute, as defined in RFC7252, section 7.2.1.:
172-
* "The Content-Format code "ct" attribute
173-
* provides a hint about the
174-
* Content-Formats this resource returns."
172+
* "The Content-Format code "ct" attribute
173+
* provides a hint about the
174+
* Content-Formats this resource returns."
175175
* (Section 12.3. lists possible ct values.) */
176176
coap_luser_entry *user_entry;
177177
};

app/coap/coap_io.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ coap_tid_t coap_send_confirmed(struct espconn *pesp_conn, coap_pdu_t *pdu) {
6464
*/
6565
coap_timer_stop();
6666
coap_timer_update(&gQueue);
67-
node->t = node->timeout;
67+
node->t = node->timeout;
6868
coap_insert_node(&gQueue, node);
6969
coap_timer_start(&gQueue);
7070
return node->id;

app/coap/coap_io.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extern "C" {
1010
#include "espconn.h"
1111
#include "pdu.h"
1212
#include "hash.h"
13-
13+
1414
coap_tid_t coap_send(struct espconn *pesp_conn, coap_pdu_t *pdu);
1515

1616
coap_tid_t coap_send_confirmed(struct espconn *pesp_conn, coap_pdu_t *pdu);

app/coap/coap_timer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ void coap_timer_tick(void *arg){
2929
node->retransmit_cnt++;
3030
node->t = node->timeout << node->retransmit_cnt;
3131

32-
NODE_DBG("** retransmission #%d of transaction %d\n",
32+
NODE_DBG("** retransmission #%d of transaction %d\n",
3333
node->retransmit_cnt, (((uint16_t)(node->pdu->pkt->hdr.id[0]))<<8)+node->pdu->pkt->hdr.id[1]);
3434
node->id = coap_send(node->pconn, node->pdu);
3535
if (COAP_INVALID_TID == node->id) {
3636
NODE_DBG("retransmission: error sending pdu\n");
3737
coap_delete_node(node);
3838
} else {
39-
coap_insert_node(queue, node);
39+
coap_insert_node(queue, node);
4040
}
4141
} else {
4242
/* And finally delete the node */

app/coap/endpoints.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static int handle_post_function(const coap_endpoint_t *ep, coap_rw_buffer_t *scr
141141
NODE_DBG("\n");
142142
lua_settop(L, n);
143143
return coap_make_response(scratch, outpkt, ret, len, id_hi, id_lo, &inpkt->tok, COAP_RSPCODE_CONTENT, COAP_CONTENTTYPE_TEXT_PLAIN);
144-
}
144+
}
145145
} else {
146146
lua_settop(L, n);
147147
return coap_make_response(scratch, outpkt, NULL, 0, id_hi, id_lo, &inpkt->tok, COAP_RSPCODE_CONTENT, COAP_CONTENTTYPE_TEXT_PLAIN);
@@ -157,7 +157,7 @@ static int handle_post_function(const coap_endpoint_t *ep, coap_rw_buffer_t *scr
157157
goto end;
158158
}
159159
}
160-
NODE_DBG("none match.\n");
160+
NODE_DBG("none match.\n");
161161
end:
162162
return coap_make_response(scratch, outpkt, NULL, 0, id_hi, id_lo, &inpkt->tok, COAP_RSPCODE_NOT_FOUND, COAP_CONTENTTYPE_NONE);
163163
}
@@ -226,7 +226,7 @@ void build_well_known_rsp(char *rsp, uint16_t rsplen)
226226
c_strncat(rsp, ",", len);
227227
len--;
228228
}
229-
229+
230230
c_strncat(rsp, "<", len);
231231
len--;
232232

@@ -250,7 +250,7 @@ void build_well_known_rsp(char *rsp, uint16_t rsplen)
250250
c_strncat(rsp, ",", len);
251251
len--;
252252
}
253-
253+
254254
c_strncat(rsp, "<", len);
255255
len--;
256256

@@ -272,7 +272,7 @@ void build_well_known_rsp(char *rsp, uint16_t rsplen)
272272
len -= 2;
273273

274274
c_strncat(rsp, ep->core_attr, len);
275-
len -= c_strlen(ep->core_attr);
275+
len -= c_strlen(ep->core_attr);
276276

277277
h = h->next;
278278
}

app/coap/hash.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ void coap_hash(const unsigned char *s, unsigned int len, coap_key_t h) {
88

99
while (len--) {
1010
j = sizeof(coap_key_t)-1;
11-
11+
1212
while (j) {
1313
h[j] = ((h[j] << 7) | (h[j-1] >> 1)) + h[j];
1414
--j;
@@ -23,8 +23,8 @@ void coap_transaction_id(const uint32_t ip, const uint32_t port, const coap_pack
2323
c_memset(h, 0, sizeof(coap_key_t));
2424

2525
/* Compare the transport address. */
26-
coap_hash((const unsigned char *)&(port), sizeof(port), h);
27-
coap_hash((const unsigned char *)&(ip), sizeof(ip), h);
26+
coap_hash((const unsigned char *)&(port), sizeof(port), h);
27+
coap_hash((const unsigned char *)&(ip), sizeof(ip), h);
2828
coap_hash((const unsigned char *)(pkt->hdr.id), sizeof(pkt->hdr.id), h);
2929
*id = ((h[0] << 8) | h[1]) ^ ((h[2] << 8) | h[3]);
3030
}

app/coap/node.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ coap_queue_t * coap_pop_next( coap_queue_t **queue ) { // this function is call
101101

102102
int coap_remove_node( coap_queue_t **queue, const coap_tid_t id){
103103
coap_queue_t *p, *q, *node;
104-
if ( !queue )
104+
if ( !queue )
105105
return 0;
106106
if ( !*queue ) // if empty
107107
return 0;

app/coap/pdu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ coap_pdu_t * coap_new_pdu(void) {
1616
return NULL;
1717
}
1818
pdu->scratch.len = MAX_REQ_SCRATCH_SIZE;
19-
19+
2020
pdu->pkt = (coap_packet_t *)c_zalloc(sizeof(coap_packet_t));
2121
if(!pdu->pkt){
2222
NODE_DBG("coap_new_pdu malloc error.\n");

app/coap/str.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Copyright (C) 2010,2011 Olaf Bergmann <[email protected]>
44
*
55
* This file is part of the CoAP library libcoap. Please see
6-
* README for terms of use.
6+
* README for terms of use.
77
*/
88

99
#include "c_stdlib.h"
1010
#include "c_types.h"
11-
11+
1212
#include "str.h"
1313

1414
str * coap_new_string(size_t size) {

app/coap/str.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2010,2011 Olaf Bergmann <[email protected]>
44
*
55
* This file is part of the CoAP library libcoap. Please see
6-
* README for terms of use.
6+
* README for terms of use.
77
*/
88

99
#ifndef _COAP_STR_H_

0 commit comments

Comments
 (0)