<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/20820">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: Fix whitespace (use tab instead of 8x space)<br><br>Change-Id: I2b8d80fb771336d4d2c4a9ea1749935bdf14a37b<br>---<br>M src/datagram.c<br>M src/rs232.c<br>M src/stream.c<br>3 files changed, 38 insertions(+), 38 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/20/20820/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/datagram.c b/src/datagram.c</span><br><span>index 4bc7bed..8b68244 100644</span><br><span>--- a/src/datagram.c</span><br><span>+++ b/src/datagram.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> LOGP(DLINP, LOGL_DEBUG, "write\n");</span><br><span> osmo_dgram_tx_write(conn);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Create an Osmocom datagram transmitter</span><br><span>@@ -246,12 +246,12 @@</span><br><span> #define OSMO_DGRAM_RX_F_RECONF (1 << 0)</span><br><span> </span><br><span> struct osmo_dgram_rx {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- char *addr;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t port;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fd ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t port;</span><br><span> int (*cb)(struct osmo_dgram_rx *conn);</span><br><span style="color: hsl(0, 100%, 40%);">- void *data;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int flags;</span><br><span style="color: hsl(120, 100%, 40%);">+ void *data;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int flags;</span><br><span> };</span><br><span> </span><br><span> /*! \brief Receive data via Osmocom datagram receiver</span><br><span>diff --git a/src/rs232.c b/src/rs232.c</span><br><span>index 8ee658a..865ec97 100644</span><br><span>--- a/src/rs232.c</span><br><span>+++ b/src/rs232.c</span><br><span>@@ -72,15 +72,15 @@</span><br><span> struct msgb *msg;</span><br><span> int written;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_DEBUG, "writing data to rs232\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_DEBUG, "writing data to rs232\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (llist_empty(&r->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- r->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- lh = r->tx_queue.next;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(lh);</span><br><span style="color: hsl(0, 100%, 40%);">- msg = llist_entry(lh, struct msgb, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&r->tx_queue)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ r->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ lh = r->tx_queue.next;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(lh);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = llist_entry(lh, struct msgb, list);</span><br><span> </span><br><span> written = write(bfd->fd, msg->data, msg->len);</span><br><span> if (written < msg->len) {</span><br><span>@@ -254,8 +254,8 @@</span><br><span> </span><br><span> void osmo_rs232_write(struct osmo_rs232 *r, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_enqueue(&r->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- r->ofd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_enqueue(&r->tx_queue, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ r->ofd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> void osmo_rs232_close(struct osmo_rs232 *r)</span><br><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index 2bb3e75..3376126 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -221,15 +221,15 @@</span><br><span> */</span><br><span> </span><br><span> enum osmo_stream_cli_state {</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_CLOSED, /* No fd associated, no timer active */</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_WAIT_RECONNECT, /* No fd associated, has timer active to try to connect again */</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_CONNECTING, /* Fd associated, but connection not yet confirmed by peer or lower layers */</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_CONNECTED, /* Fd associated and connection is established */</span><br><span style="color: hsl(0, 100%, 40%);">- STREAM_CLI_STATE_MAX</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_CLOSED, /* No fd associated, no timer active */</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_WAIT_RECONNECT, /* No fd associated, has timer active to try to connect again */</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_CONNECTING, /* Fd associated, but connection not yet confirmed by peer or lower layers */</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_CONNECTED, /* Fd associated and connection is established */</span><br><span style="color: hsl(120, 100%, 40%);">+ STREAM_CLI_STATE_MAX</span><br><span> };</span><br><span> </span><br><span> static const struct value_string stream_cli_state_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { STREAM_CLI_STATE_CLOSED, "CLOSED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { STREAM_CLI_STATE_CLOSED, "CLOSED" },</span><br><span> { STREAM_CLI_STATE_WAIT_RECONNECT, "WAIT_RECONNECT" },</span><br><span> { STREAM_CLI_STATE_CONNECTING, "CONNECTING" },</span><br><span> { STREAM_CLI_STATE_CONNECTED, "CONNECTED" },</span><br><span>@@ -251,10 +251,10 @@</span><br><span> struct osmo_timer_list timer;</span><br><span> enum osmo_stream_cli_state state;</span><br><span> char *addr[OSMO_STREAM_MAX_ADDRS];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t addrcnt;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t addrcnt;</span><br><span> uint16_t port;</span><br><span> char *local_addr[OSMO_STREAM_MAX_ADDRS];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t local_addrcnt;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t local_addrcnt;</span><br><span> uint16_t local_port;</span><br><span> uint16_t proto;</span><br><span> int (*connect_cb)(struct osmo_stream_cli *srv);</span><br><span>@@ -422,7 +422,7 @@</span><br><span> /* Only CONNECTING and CONNECTED states are expected, since they are the only states where FD exists: */</span><br><span> osmo_panic("osmo_stream_cli_fd_cb called with unexpected state %d\n", cli->state);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> static void cli_timer_cb(void *data);</span><br><span>@@ -823,14 +823,14 @@</span><br><span> #define OSMO_STREAM_SRV_F_NODELAY (1 << 1)</span><br><span> </span><br><span> struct osmo_stream_srv_link {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- char *addr[OSMO_STREAM_MAX_ADDRS];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t addrcnt;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t port;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t proto;</span><br><span style="color: hsl(0, 100%, 40%);">- int (*accept_cb)(struct osmo_stream_srv_link *srv, int fd);</span><br><span style="color: hsl(0, 100%, 40%);">- void *data;</span><br><span style="color: hsl(0, 100%, 40%);">- int flags;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fd ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *addr[OSMO_STREAM_MAX_ADDRS];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t addrcnt;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t port;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t proto;</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*accept_cb)(struct osmo_stream_srv_link *srv, int fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ void *data;</span><br><span style="color: hsl(120, 100%, 40%);">+ int flags;</span><br><span> };</span><br><span> </span><br><span> static int osmo_stream_srv_fd_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span>@@ -1100,11 +1100,11 @@</span><br><span> </span><br><span> struct osmo_stream_srv {</span><br><span> struct osmo_stream_srv_link *srv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_fd ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head tx_queue;</span><br><span style="color: hsl(0, 100%, 40%);">- int (*closed_cb)(struct osmo_stream_srv *peer);</span><br><span style="color: hsl(0, 100%, 40%);">- int (*cb)(struct osmo_stream_srv *peer);</span><br><span style="color: hsl(0, 100%, 40%);">- void *data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fd ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head tx_queue;</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*closed_cb)(struct osmo_stream_srv *peer);</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*cb)(struct osmo_stream_srv *peer);</span><br><span style="color: hsl(120, 100%, 40%);">+ void *data;</span><br><span> int flags;</span><br><span> };</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/20820">change 20820</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-netif/+/20820"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2b8d80fb771336d4d2c4a9ea1749935bdf14a37b </div>
<div style="display:none"> Gerrit-Change-Number: 20820 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>