Skip to content

Commit 7621706

Browse files
pfalconpfalcon
committed
extmod/modlwip.c: Codestyle whitespace changes.
With MicroPython codestyle, with pointer casts, "*" packs with primary type without space. Few other similar changes too (git diff -b -w is null).
1 parent a13d22f commit 7621706

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎extmod/modlwip.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ typedef struct _lwip_slip_obj_t {
6565
STATIC lwip_slip_obj_t lwip_slip_obj;
6666

6767
// Declare these early.
68-
void mod_lwip_register_poll(void (* poll)(void *arg), void *poll_arg);
69-
void mod_lwip_deregister_poll(void (* poll)(void *arg), void *poll_arg);
68+
void mod_lwip_register_poll(void (*poll)(void *arg), void *poll_arg);
69+
void mod_lwip_deregister_poll(void (*poll)(void *arg), void *poll_arg);
7070

7171
STATIC void slip_lwip_poll(void *netif) {
72-
slipif_poll((struct netif *)netif);
72+
slipif_poll((struct netif*)netif);
7373
}
7474

7575
STATIC const mp_obj_type_t lwip_slip_type;
@@ -206,21 +206,21 @@ typedef struct _lwip_socket_obj_t {
206206
// Callback for incoming UDP packets. We simply stash the packet and the source address,
207207
// in case we need it for recvfrom.
208208
STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, ip_addr_t *addr, u16_t port) {
209-
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
209+
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
210210

211211
if (socket->incoming != NULL) {
212212
// That's why they call it "unreliable". No room in the inn, drop the packet.
213213
pbuf_free(p);
214214
} else {
215-
socket->incoming = (void *)p;
215+
socket->incoming = (void*)p;
216216
socket->peer_port = (mp_uint_t)port;
217217
memcpy(&(socket->peer), addr, 4);
218218
}
219219
}
220220

221221
// Callback for general tcp errors.
222222
STATIC void _lwip_tcp_error(void *arg, err_t err) {
223-
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
223+
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
224224

225225
// Pass the error code back via the connection variable.
226226
socket->connected = err;
@@ -230,29 +230,29 @@ STATIC void _lwip_tcp_error(void *arg, err_t err) {
230230

231231
// Callback for tcp connection requests. Error code err is unused. (See tcp.h)
232232
STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
233-
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
233+
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
234234

235235
socket->connected = 2;
236236
return ERR_OK;
237237
}
238238

239239
// Callback for incoming tcp connections.
240240
STATIC err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) {
241-
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
241+
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
242242

243243
if (socket->incoming != NULL) {
244244
// We need to handle this better. This single-level structure makes the
245245
// backlog setting kind of pointless. FIXME
246246
return ERR_BUF;
247247
} else {
248-
socket->incoming = (void *)newpcb;
248+
socket->incoming = (void*)newpcb;
249249
return ERR_OK;
250250
}
251251
}
252252

253253
// Callback for inbound tcp packets.
254254
STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err_t err) {
255-
lwip_socket_obj_t *socket = (lwip_socket_obj_t *)arg;
255+
lwip_socket_obj_t *socket = (lwip_socket_obj_t*)arg;
256256

257257
if (p == NULL) {
258258
// Other side has closed connection.
@@ -262,7 +262,7 @@ STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err
262262
// No room in the inn, let LWIP know it's still responsible for delivery later
263263
return ERR_BUF;
264264
}
265-
socket->incoming = (void *)p;
265+
socket->incoming = (void*)p;
266266
return ERR_OK;
267267
}
268268

@@ -301,11 +301,11 @@ STATIC mp_uint_t lwip_udp_send(lwip_socket_obj_t *socket, const byte *buf, mp_ui
301301

302302
err_t err;
303303
if (ip == NULL) {
304-
err = udp_send((struct udp_pcb *)socket->pcb, p);
304+
err = udp_send((struct udp_pcb*)socket->pcb, p);
305305
} else {
306306
ip_addr_t dest;
307307
IP4_ADDR(&dest, ip[0], ip[1], ip[2], ip[3]);
308-
err = udp_sendto((struct udp_pcb *)socket->pcb, p, &dest, port);
308+
err = udp_sendto((struct udp_pcb*)socket->pcb, p, &dest, port);
309309
}
310310

311311
pbuf_free(p);
@@ -343,7 +343,7 @@ STATIC mp_uint_t lwip_udp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
343343
*port = socket->peer_port;
344344
}
345345

346-
struct pbuf *p = (struct pbuf *)socket->incoming;
346+
struct pbuf *p = (struct pbuf*)socket->incoming;
347347

348348
u16_t result = pbuf_copy_partial(p, buf, ((p->tot_len > len) ? len : p->tot_len), 0);
349349
pbuf_free(p);
@@ -433,9 +433,9 @@ STATIC mp_obj_t lwip_socket_make_new(mp_obj_t type_in, mp_uint_t n_args,
433433
}
434434

435435
switch (socket->type) {
436-
case MOD_NETWORK_SOCK_STREAM: socket->pcb = (void *)tcp_new(); break;
437-
case MOD_NETWORK_SOCK_DGRAM: socket->pcb = (void *)udp_new(); break;
438-
//case MOD_NETWORK_SOCK_RAW: socket->pcb = (void *)raw_new(); break;
436+
case MOD_NETWORK_SOCK_STREAM: socket->pcb = (void*)tcp_new(); break;
437+
case MOD_NETWORK_SOCK_DGRAM: socket->pcb = (void*)udp_new(); break;
438+
//case MOD_NETWORK_SOCK_RAW: socket->pcb = (void*)raw_new(); break;
439439
default: nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EINVAL)));
440440
}
441441

@@ -446,15 +446,15 @@ STATIC mp_obj_t lwip_socket_make_new(mp_obj_t type_in, mp_uint_t n_args,
446446
switch (socket->type) {
447447
case MOD_NETWORK_SOCK_STREAM: {
448448
// Register the socket object as our callback argument.
449-
tcp_arg((struct tcp_pcb *)socket->pcb, (void *)socket);
449+
tcp_arg((struct tcp_pcb*)socket->pcb, (void*)socket);
450450
// Register our error callback.
451-
tcp_err((struct tcp_pcb *)socket->pcb, _lwip_tcp_error);
451+
tcp_err((struct tcp_pcb*)socket->pcb, _lwip_tcp_error);
452452
break;
453453
}
454454
case MOD_NETWORK_SOCK_DGRAM: {
455455
// Register our receive callback now. Since UDP sockets don't require binding or connection
456456
// before use, there's no other good time to do it.
457-
udp_recv((struct udp_pcb *)socket->pcb, _lwip_udp_incoming, (void *)socket);
457+
udp_recv((struct udp_pcb*)socket->pcb, _lwip_udp_incoming, (void*)socket);
458458
break;
459459
}
460460
}
@@ -475,24 +475,24 @@ STATIC mp_obj_t lwip_socket_close(mp_obj_t self_in) {
475475
}
476476
switch (socket->type) {
477477
case MOD_NETWORK_SOCK_STREAM: {
478-
if (((struct tcp_pcb *)socket->pcb)->state == LISTEN) {
478+
if (((struct tcp_pcb*)socket->pcb)->state == LISTEN) {
479479
socket_is_listener = true;
480480
}
481-
if (tcp_close((struct tcp_pcb *)socket->pcb) != ERR_OK) {
482-
tcp_abort((struct tcp_pcb *)socket->pcb);
481+
if (tcp_close((struct tcp_pcb*)socket->pcb) != ERR_OK) {
482+
tcp_abort((struct tcp_pcb*)socket->pcb);
483483
}
484484
break;
485485
}
486-
case MOD_NETWORK_SOCK_DGRAM: udp_remove((struct udp_pcb *)socket->pcb); break;
487-
//case MOD_NETWORK_SOCK_RAW: raw_remove((struct raw_pcb *)socket->pcb); break;
486+
case MOD_NETWORK_SOCK_DGRAM: udp_remove((struct udp_pcb*)socket->pcb); break;
487+
//case MOD_NETWORK_SOCK_RAW: raw_remove((struct raw_pcb*)socket->pcb); break;
488488
}
489489
socket->pcb = NULL;
490490
socket->connected = -16; // EBADF
491491
if (socket->incoming != NULL) {
492492
if (!socket_is_listener) {
493-
pbuf_free((struct pbuf *)socket->incoming);
493+
pbuf_free((struct pbuf*)socket->incoming);
494494
} else {
495-
tcp_abort((struct tcp_pcb *)socket->incoming);
495+
tcp_abort((struct tcp_pcb*)socket->incoming);
496496
}
497497
socket->incoming = NULL;
498498
}
@@ -513,11 +513,11 @@ STATIC mp_obj_t lwip_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
513513
err_t err = ERR_ARG;
514514
switch (socket->type) {
515515
case MOD_NETWORK_SOCK_STREAM: {
516-
err = tcp_bind((struct tcp_pcb *)socket->pcb, &bind_addr, port);
516+
err = tcp_bind((struct tcp_pcb*)socket->pcb, &bind_addr, port);
517517
break;
518518
}
519519
case MOD_NETWORK_SOCK_DGRAM: {
520-
err = udp_bind((struct udp_pcb *)socket->pcb, &bind_addr, port);
520+
err = udp_bind((struct udp_pcb*)socket->pcb, &bind_addr, port);
521521
break;
522522
}
523523
}
@@ -541,11 +541,11 @@ STATIC mp_obj_t lwip_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
541541
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EOPNOTSUPP)));
542542
}
543543

544-
struct tcp_pcb *new_pcb = tcp_listen_with_backlog((struct tcp_pcb *)socket->pcb, (u8_t)backlog);
544+
struct tcp_pcb *new_pcb = tcp_listen_with_backlog((struct tcp_pcb*)socket->pcb, (u8_t)backlog);
545545
if (new_pcb == NULL) {
546546
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOMEM)));
547547
}
548-
socket->pcb = (void *)new_pcb;
548+
socket->pcb = (void*)new_pcb;
549549
tcp_accept(new_pcb, _lwip_tcp_accept);
550550

551551
return mp_const_none;
@@ -562,7 +562,7 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
562562
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EOPNOTSUPP)));
563563
}
564564
// I need to do this because "tcp_accepted", later, is a macro.
565-
struct tcp_pcb *listener = (struct tcp_pcb *)socket->pcb;
565+
struct tcp_pcb *listener = (struct tcp_pcb*)socket->pcb;
566566
if (listener->state != LISTEN) {
567567
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EINVAL)));
568568
}
@@ -599,16 +599,16 @@ STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
599599
socket2->timeout = socket->timeout;
600600
socket2->connected = 2;
601601
socket2->leftover_count = 0;
602-
tcp_arg((struct tcp_pcb *)socket2->pcb, (void *)socket2);
603-
tcp_err((struct tcp_pcb *)socket2->pcb, _lwip_tcp_error);
604-
tcp_recv((struct tcp_pcb *)socket2->pcb, _lwip_tcp_recv);
602+
tcp_arg((struct tcp_pcb*)socket2->pcb, (void*)socket2);
603+
tcp_err((struct tcp_pcb*)socket2->pcb, _lwip_tcp_error);
604+
tcp_recv((struct tcp_pcb*)socket2->pcb, _lwip_tcp_recv);
605605

606606
tcp_accepted(listener);
607607

608608
// make the return value
609609
uint8_t ip[NETUTILS_IPV4ADDR_BUFSIZE];
610-
memcpy(ip, &(((struct tcp_pcb *)socket2->pcb)->remote_ip), 4);
611-
mp_uint_t port = (mp_uint_t) ((struct tcp_pcb *)socket2->pcb)->remote_port;
610+
memcpy(ip, &(((struct tcp_pcb*)socket2->pcb)->remote_ip), 4);
611+
mp_uint_t port = (mp_uint_t)((struct tcp_pcb*)socket2->pcb)->remote_port;
612612
mp_obj_tuple_t *client = mp_obj_new_tuple(2, NULL);
613613
client->items[0] = socket2;
614614
client->items[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
@@ -642,10 +642,10 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
642642
}
643643
}
644644
// Register our recieve callback.
645-
tcp_recv((struct tcp_pcb *)socket->pcb, _lwip_tcp_recv);
645+
tcp_recv((struct tcp_pcb*)socket->pcb, _lwip_tcp_recv);
646646
// Mark us as "connecting"
647647
socket->connected = 1;
648-
err = tcp_connect((struct tcp_pcb *)socket->pcb, &dest, port, _lwip_tcp_connected);
648+
err = tcp_connect((struct tcp_pcb*)socket->pcb, &dest, port, _lwip_tcp_connected);
649649
if (err != ERR_OK) {
650650
socket->connected = 0;
651651
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error_lookup_table[-err])));
@@ -674,7 +674,7 @@ STATIC mp_obj_t lwip_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
674674
break;
675675
}
676676
case MOD_NETWORK_SOCK_DGRAM: {
677-
err = udp_connect((struct udp_pcb *)socket->pcb, &dest, port);
677+
err = udp_connect((struct udp_pcb*)socket->pcb, &dest, port);
678678
break;
679679
}
680680
}

0 commit comments

Comments
 (0)