<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16181">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix various compiler warnings<br><br>Change-Id: I65a862132563f578eff11b8d085960b820f5d4b7<br>---<br>M src/e1cap_dump.c<br>M src/hdlc-test.c<br>M src/storage.c<br>3 files changed, 13 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c</span><br><span>index 1986041..027aa82 100644</span><br><span>--- a/src/e1cap_dump.c</span><br><span>+++ b/src/e1cap_dump.c</span><br><span>@@ -53,7 +53,7 @@</span><br><span> time_t nowtime;</span><br><span> struct tm *nowtm;</span><br><span> char tmbuf[64];</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ static char buf[64+20];</span><br><span> </span><br><span> nowtime = tv->tv_sec;</span><br><span> nowtm = localtime(&nowtime);</span><br><span>@@ -62,6 +62,7 @@</span><br><span> return buf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span> static int all_bytes_are(unsigned char ch, const uint8_t *data, int len)</span><br><span> {</span><br><span> int i;</span><br><span>@@ -72,6 +73,7 @@</span><br><span> }</span><br><span> return 1;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> static void handle_hdlc_frame_content(const uint8_t *data, unsigned int len,</span><br><span> void *priv)</span><br><span>@@ -151,6 +153,8 @@</span><br><span> </span><br><span> static void handle_data(struct osmo_e1cap_pkthdr *pkt, uint8_t *data, int len)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval tv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> flip_buf_bits(data, len);</span><br><span> #if 0</span><br><span> /* filter out all-ff/all-fe/all-7f */</span><br><span>@@ -170,8 +174,10 @@</span><br><span> </span><br><span> switch (g_mode) {</span><br><span> case MODE_PRINT:</span><br><span style="color: hsl(120, 100%, 40%);">+ tv.tv_sec = pkt->ts.tv_sec;</span><br><span style="color: hsl(120, 100%, 40%);">+ tv.tv_usec = pkt->ts.tv_usec;</span><br><span> printf("%s %02u/%02u %u (%u): %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- timeval2str(&pkt->ts),</span><br><span style="color: hsl(120, 100%, 40%);">+ timeval2str(&tv),</span><br><span> pkt->line_nr, pkt->ts_nr, pkt->capture_mode,</span><br><span> pkt->len,</span><br><span> osmo_hexdump_nospc(data, len));</span><br><span>diff --git a/src/hdlc-test.c b/src/hdlc-test.c</span><br><span>index 1c7c6ef..0814ca0 100644</span><br><span>--- a/src/hdlc-test.c</span><br><span>+++ b/src/hdlc-test.c</span><br><span>@@ -12,12 +12,11 @@</span><br><span> int string_len = strlen(hex);</span><br><span> int byte_len = string_len/2;</span><br><span> int bit_len = byte_len*8;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> </span><br><span> printf("hex string = %s\n", hex);</span><br><span> bytes = alloca(byte_len);</span><br><span> bits = alloca(bit_len);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_hexparse(hex, bytes, byte_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexparse(hex, bytes, byte_len);</span><br><span> printf("parsed bytes = %s\n", osmo_hexdump(bytes, byte_len));</span><br><span> </span><br><span> printf("MSB mode\n");</span><br><span>diff --git a/src/storage.c b/src/storage.c</span><br><span>index bcb50a2..a084535 100644</span><br><span>--- a/src/storage.c</span><br><span>+++ b/src/storage.c</span><br><span>@@ -66,6 +66,7 @@</span><br><span> int e1frame_store(struct e1inp_ts *ts, struct msgb *msg, enum osmo_e1cap_capture_mode mode)</span><br><span> {</span><br><span> struct osmo_e1cap_pkthdr _h, *h = &_h;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval tv;</span><br><span> int rc;</span><br><span> struct iovec iov[2] = {</span><br><span> {</span><br><span>@@ -78,7 +79,9 @@</span><br><span> };</span><br><span> </span><br><span> h->len = htonl(msg->len);</span><br><span style="color: hsl(0, 100%, 40%);">- gettimeofday(&h->ts, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gettimeofday(&tv, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ h->ts.tv_sec = tv.tv_sec;</span><br><span style="color: hsl(120, 100%, 40%);">+ h->ts.tv_usec = tv.tv_usec;</span><br><span> h->line_nr = ts->line->num;</span><br><span> h->ts_nr = ts->num;</span><br><span> h->capture_mode = mode;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16181">change 16181</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/osmo-e1-recorder/+/16181"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1-recorder </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I65a862132563f578eff11b8d085960b820f5d4b7 </div>
<div style="display:none"> Gerrit-Change-Number: 16181 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>