- gerrit-log - lists.osmocom.org

Change in libosmocore[master]: msgb: Fix -Wsign-compare warnings

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26815 ) Change subject: msgb: Fix -Wsign-compare warnings ...................................................................... msgb: Fix -Wsign-compare warnings Change-Id: I4bd14bb712fb3868b55d7e79d13276b707a6cdcb --- M src/msgb.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/26815/1 diff --git a/src/msgb.c b/src/msgb.c index ccb55aa..0881a55 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -426,11 +426,11 @@ */ char *msgb_hexdump_buf(char *buf, size_t buf_len, const struct msgb *msg) { - int buf_offs = 0; + unsigned int buf_offs = 0; int nchars; const unsigned char *start = msg->data; const unsigned char *lxhs[4]; - int i; + unsigned int i; lxhs[0] = msg->l1h; lxhs[1] = msg->l2h; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4bd14bb712fb3868b55d7e79d13276b707a6cdcb Gerrit-Change-Number: 26815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

2
3
0 0

Change in libosmocore[master]: socket, select: Fix -Wsign-compare warnings

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 ) Change subject: socket, select: Fix -Wsign-compare warnings ...................................................................... socket, select: Fix -Wsign-compare warnings Change-Id: Idf6213e66e9bf609e930c6134292458a7d521871 --- M src/select.c M src/socket.c 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/26814/1 diff --git a/src/select.c b/src/select.c index ddff132..735ea3e 100644 --- a/src/select.c +++ b/src/select.c @@ -316,7 +316,7 @@ } /* iterate over first n_fd entries of g_poll.poll + dispatch */ -static int poll_disp_fds(int n_fd) +static int poll_disp_fds(unsigned int n_fd) { struct osmo_fd *ufd; unsigned int i; diff --git a/src/socket.c b/src/socket.c index 1251061..b33116c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -114,7 +114,7 @@ static int addrinfo_helper_multi(struct addrinfo **addrinfo, uint16_t family, uint16_t type, uint8_t proto, const char **hosts, size_t host_cnt, uint16_t port, bool passive) { - int i, j; + unsigned int i, j; for (i = 0; i < host_cnt; i++) { addrinfo[i] = addrinfo_helper(family, type, proto, hosts[i], port, passive); @@ -210,7 +210,8 @@ static int multiaddr_snprintf(char* buf, size_t buf_len, const char **hosts, size_t host_cnt) { int len = 0, offset = 0, rem = buf_len; - int ret, i; + unsigned int i; + int ret; char *after; if (buf_len < 3) @@ -665,7 +666,7 @@ /* Build array of addresses taking first addrinfo result of the requested family * for each host in addrs_buf. */ static int addrinfo_to_sockaddr(uint16_t family, const struct addrinfo **result, - const char **hosts, int host_cont, + const char **hosts, unsigned int host_cont, uint8_t *addrs_buf, size_t addrs_buf_len) { size_t host_idx, offset = 0; const struct addrinfo *rp; @@ -721,7 +722,7 @@ { struct addrinfo *res_loc[OSMO_SOCK_MAX_ADDRS], *res_rem[OSMO_SOCK_MAX_ADDRS]; int sfd = -1, rc, on = 1; - int i; + unsigned int i; bool loc_has_v4addr, rem_has_v4addr; bool loc_has_v6addr, rem_has_v6addr; struct sockaddr_in6 addrs_buf[OSMO_SOCK_MAX_ADDRS]; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf6213e66e9bf609e930c6134292458a7d521871 Gerrit-Change-Number: 26814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

3
6
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26722 ) Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jan 2022 10:29:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26722 ) Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/26722/5/src/iu_helpers.c File src/iu_helpers.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26722/5/src/iu_helpers.c@180 PS5, Line 180: uint8_t binding_id[4] = { 0 }; > why 4 bytes? isn't it a 16bit integer? hence 2 bytes? The field is 32 bit long, even though it stores only a 16 bit port number. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jan 2022 10:20:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in osmo-e1d[master]: usb: Use libusb_status_str when logging INT EP error

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26821 ) Change subject: usb: Use libusb_status_str when logging INT EP error ...................................................................... usb: Use libusb_status_str when logging INT EP error Change-Id: I3a3cd88ba35796740dbd399eb618617941dae54a --- M src/usb.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/21/26821/1 diff --git a/src/usb.c b/src/usb.c index 7db9994..94cccae 100644 --- a/src/usb.c +++ b/src/usb.c @@ -376,7 +376,8 @@ const struct ice1usb_irq *irq = (const struct ice1usb_irq *) xfer->buffer; if (xfer->status != LIBUSB_TRANSFER_COMPLETED) { - LOGPLI(line, DE1D, LOGL_ERROR, "Error in Interrupt transfer\n"); + LOGPLI(line, DE1D, LOGL_ERROR, "INT EP %02x transfer failed with status %s\n", + xfer->endpoint, get_value_string(libusb_status_str, xfer->status)); goto out; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I3a3cd88ba35796740dbd399eb618617941dae54a Gerrit-Change-Number: 26821 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

2
3
0 0

Change in osmo-e1d[master]: usb: Print failed USB isochronous packets

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26819 ) Change subject: usb: Print failed USB isochronous packets ...................................................................... usb: Print failed USB isochronous packets Change-Id: Ib6fcf46be40d47817632ccae4e742d6cf7340cda --- M src/usb.c 1 file changed, 28 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/19/26819/1 diff --git a/src/usb.c b/src/usb.c index d5107bc..2ccb3ac 100644 --- a/src/usb.c +++ b/src/usb.c @@ -173,6 +173,18 @@ // USB flow // --------------------------------------------------------------------------- +/* strings for enum libusb_transfer_status */ +static const struct value_string libusb_status_str[] = { + { LIBUSB_TRANSFER_COMPLETED, "COMPLETED" }, + { LIBUSB_TRANSFER_ERROR, "ERROR" }, + { LIBUSB_TRANSFER_TIMED_OUT, "TIMED_OUT" }, + { LIBUSB_TRANSFER_CANCELLED, "CANCELLED" }, + { LIBUSB_TRANSFER_STALL, "STALL" }, + { LIBUSB_TRANSFER_NO_DEVICE, "NO_DEVICE" }, + { LIBUSB_TRANSFER_OVERFLOW, "OVERFLOW" }, + { 0, NULL } +}; + static void LIBUSB_CALL _e1uf_xfr(struct libusb_transfer *xfr) { @@ -184,18 +196,29 @@ /* FIXME: Check transfer status ? Error handling ? */ + if (flow->ep & 0x80) { for (j=0; j<flow->ppx; j++) { + struct libusb_iso_packet_descriptor *iso_pd = &xfr->iso_packet_desc[j]; + if (iso_pd->status != LIBUSB_TRANSFER_COMPLETED) { + LOGPLI(flow->line, DE1D, LOGL_ERROR, "IN EP %02x ISO packet %d failed with status %s\n", + flow->ep, j, get_value_string(libusb_status_str, iso_pd->status)); + } flow->cb(flow, libusb_get_iso_packet_buffer_simple(xfr, j), - (xfr->iso_packet_desc[j].status == LIBUSB_TRANSFER_COMPLETED) ? - xfr->iso_packet_desc[j].actual_length : -1 + (iso_pd->status == LIBUSB_TRANSFER_COMPLETED) ? iso_pd->actual_length : -1 ); - len += (xfr->iso_packet_desc[j].length = flow->size); + len += (iso_pd->length = flow->size); } } else { - for (j=0; j<flow->ppx; j++) - len += (xfr->iso_packet_desc[j].length = flow->cb(flow, &xfr->buffer[len], flow->size)); + for (j=0; j<flow->ppx; j++) { + struct libusb_iso_packet_descriptor *iso_pd = &xfr->iso_packet_desc[j]; + if (iso_pd->status != LIBUSB_TRANSFER_COMPLETED) { + LOGPLI(flow->line, DE1D, LOGL_ERROR, "OUT EP %02x ISO packet %d failed with status %s\n", + flow->ep, j, get_value_string(libusb_status_str, iso_pd->status)); + } + len += (iso_pd->length = flow->cb(flow, &xfr->buffer[len], flow->size)); + } } libusb_fill_iso_transfer(xfr, id->devh, flow->ep, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib6fcf46be40d47817632ccae4e742d6cf7340cda Gerrit-Change-Number: 26819 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

2
7
0 0

Change in osmo-e1d[master]: cosmetic: Adhere osmocom coding style in for-loops

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/26820 ) Change subject: cosmetic: Adhere osmocom coding style in for-loops ...................................................................... cosmetic: Adhere osmocom coding style in for-loops We either have to bring osmo-e1d in line with other osmocom projects, or we'd have to disable the linter in jenkins. Change-Id: I74ab20b22118d471dcdb60d1b9681ab62eb13d51 --- M src/ctl.c M src/intf_line.c M src/mux_demux.c M src/usb.c 4 files changed, 17 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/20/26820/1 diff --git a/src/ctl.c b/src/ctl.c index 4a922b9..7040001 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -278,7 +278,7 @@ if (n == 1) { _e1d_fill_ts_info(ti, &line->ts[hdr->ts]); } else { - for (int i=0; i<32; i++) + for (int i = 0; i < 32; i++) _e1d_fill_ts_info(ti++, &line->ts[i]); } diff --git a/src/intf_line.c b/src/intf_line.c index 5659129..1f833fb 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -192,7 +192,7 @@ line->drv_data = drv_data; line->mode = E1_LINE_MODE_CHANNELIZED; - for (int i=0; i<32; i++) + for (int i = 0; i < 32; i++) _ts_init(&line->ts[i], line, i); _ts_init(&line->superchan, line, E1DP_TS_SUPERCHAN); @@ -228,7 +228,7 @@ osmo_timer_del(&line->watchdog.timer); /* close all [peer] file descriptors */ - for (int i=0; i<32; i++) + for (int i = 0; i < 32; i++) e1_ts_stop(&line->ts[i]); /* remove from per-interface list of lines */ diff --git a/src/mux_demux.c b/src/mux_demux.c index 2971c87..6a7b326 100644 --- a/src/mux_demux.c +++ b/src/mux_demux.c @@ -151,8 +151,7 @@ OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED); /* Scan timeslots */ - for (int tsn=1; tsn<32; tsn++) - { + for (int tsn = 1; tsn < 32; tsn++) { struct e1_ts *ts = &line->ts[tsn]; uint8_t buf_ts[fts]; int l; @@ -164,7 +163,7 @@ if (l <= 0) continue; - for (int i=0; i<l; i++) + for (int i = 0; i < l; i++) buf[tsn+(i*32)] = buf_ts[i]; } } @@ -327,15 +326,14 @@ { OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED); - for (int tsn=1; tsn<32; tsn++) - { + for (int tsn = 1; tsn < 32; tsn++) { struct e1_ts *ts = &line->ts[tsn]; uint8_t buf_ts[ftr]; if (ts->mode == E1_TS_MODE_OFF) continue; - for (int i=0; i<ftr; i++) + for (int i = 0; i < ftr; i++) buf_ts[i] = buf[tsn+(i*32)]; _e1_ts_write(ts, buf_ts, ftr); diff --git a/src/usb.c b/src/usb.c index c67f5b9..d36ed42 100644 --- a/src/usb.c +++ b/src/usb.c @@ -185,7 +185,7 @@ /* FIXME: Check transfer status ? Error handling ? */ if (flow->ep & 0x80) { - for (j=0; j<flow->ppx; j++) { + for (j = 0; j < flow->ppx; j++) { flow->cb(flow, libusb_get_iso_packet_buffer_simple(xfr, j), (xfr->iso_packet_desc[j].status == LIBUSB_TRANSFER_COMPLETED) ? @@ -194,7 +194,7 @@ len += (xfr->iso_packet_desc[j].length = flow->size); } } else { - for (j=0; j<flow->ppx; j++) + for (j = 0; j < flow->ppx; j++) len += (xfr->iso_packet_desc[j].length = flow->cb(flow, &xfr->buffer[len], flow->size)); } @@ -226,7 +226,7 @@ flow->ppx = ppx; flow->entries = talloc_zero_size(ctx, count * sizeof(struct e1_usb_flow_entry)); - for (int i=0; i<count; i++) + for (int i = 0; i < count; i++) flow->entries[i].buf = talloc_zero_size(ctx, size * ppx); return flow; @@ -239,7 +239,7 @@ return; /* FIXME: stop pending transfers */ - for (int i=0; i<flow->count; i++) + for (int i = 0; i < flow->count; i++) talloc_free(flow->entries[i].buf); talloc_free(flow->entries); @@ -253,8 +253,7 @@ struct libusb_transfer *xfr; int i, j, rv, len; - for (i=0; i<flow->count; i++) - { + for (i = 0; i < flow->count; i++) { xfr = libusb_alloc_transfer(flow->ppx); if (!xfr) return -ENOMEM; @@ -262,10 +261,10 @@ len = 0; if (flow->ep & 0x80) { - for (j=0; j<flow->ppx; j++) + for (j = 0; j < flow->ppx; j++) len += (xfr->iso_packet_desc[j].length = flow->size); } else { - for (j=0; j<flow->ppx; j++) + for (j = 0; j < flow->ppx; j++) len += (xfr->iso_packet_desc[j].length = flow->cb(flow, &flow->entries[i].buf[len], flow->size)); } @@ -529,7 +528,7 @@ return ret; } - for (i=0; i<cd->bNumInterfaces; i++) { + for (i =0; i < cd->bNumInterfaces; i++) { /* Expect 2 altsettings with proper class/subclass/eps */ if (cd->interface[i].num_altsetting != 2) continue; @@ -559,7 +558,7 @@ line_data->r_acc = 0; line_data->r_sw = 8192; - for (j=0; j<id->bNumEndpoints; j++) { + for (j = 0; j < id->bNumEndpoints; j++) { if (id->endpoint[j].bmAttributes == 0x11) { line_data->ep_fb = id->endpoint[j].bEndpointAddress; } else if (id->endpoint[j].bmAttributes == 0x05) { @@ -623,7 +622,7 @@ return -EIO; } - for (i=0; i<n_dev; i++) { + for (i = 0; i < n_dev; i++) { struct libusb_device_descriptor desc; ret = libusb_get_device_descriptor(dev_list[i], &desc); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/26820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I74ab20b22118d471dcdb60d1b9681ab62eb13d51 Gerrit-Change-Number: 26820 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 6 months

3
5
0 0

Change in libosmocore[master]: bits.c: Fix -Wsign-compare warnings

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26813 ) Change subject: bits.c: Fix -Wsign-compare warnings ...................................................................... bits.c: Fix -Wsign-compare warnings Change-Id: I6a2e3e9c8743b229633204562712fda1433a78ec --- M src/bits.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/26813/1 diff --git a/src/bits.c b/src/bits.c index 4b413a3..c1c3f90 100644 --- a/src/bits.c +++ b/src/bits.c @@ -188,7 +188,7 @@ const ubit_t *in, unsigned int in_ofs, unsigned int num_bits, int lsb_mode) { - int i, op, bn; + unsigned int i, op, bn; for (i=0; i<num_bits; i++) { op = out_ofs + i; bn = lsb_mode ? (op&7) : (7-(op&7)); @@ -213,7 +213,7 @@ const pbit_t *in, unsigned int in_ofs, unsigned int num_bits, int lsb_mode) { - int i, ip, bn; + unsigned int i, ip, bn; for (i=0; i<num_bits; i++) { ip = in_ofs + i; bn = lsb_mode ? (ip&7) : (7-(ip&7)); @@ -304,7 +304,7 @@ */ void osmo_revbytebits_buf(uint8_t *buf, int len) { - unsigned int i; + int i; for (i = 0; i < len; i++) buf[i] = flip_table[buf[i]]; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6a2e3e9c8743b229633204562712fda1433a78ec Gerrit-Change-Number: 26813 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 6 months

3
3
0 0

Change in libosmocore[master]: bitvec: Fix -Wsign-compare warnings

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26810 ) Change subject: bitvec: Fix -Wsign-compare warnings ...................................................................... bitvec: Fix -Wsign-compare warnings Change-Id: I34f65cda83bcd7050bd0cc0fb9e5cb5d33a09086 --- M include/osmocom/core/bitvec.h M src/bitvec.c 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/26810/1 diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h index 6a37861..70b0e27 100644 --- a/include/osmocom/core/bitvec.h +++ b/include/osmocom/core/bitvec.h @@ -73,7 +73,7 @@ void bitvec_to_string_r(const struct bitvec *bv, char *str); void bitvec_zero(struct bitvec *bv); unsigned bitvec_rl(const struct bitvec *bv, bool b); -unsigned bitvec_rl_curbit(struct bitvec *bv, bool b, int max_bits); +unsigned bitvec_rl_curbit(struct bitvec *bv, bool b, unsigned int max_bits); void bitvec_shiftl(struct bitvec *bv, unsigned int n); int16_t bitvec_get_int16_msb(const struct bitvec *bv, unsigned int num_bits); unsigned int bitvec_add_array(struct bitvec *bv, const uint32_t *array, diff --git a/src/bitvec.c b/src/bitvec.c index 6a54344..350f738 100644 --- a/src/bitvec.c +++ b/src/bitvec.c @@ -197,7 +197,8 @@ * \return 0 on success; negative in case of error */ int bitvec_set_bits(struct bitvec *bv, const enum bit_value *bits, unsigned int count) { - int i, rc; + unsigned int i; + int rc; for (i = 0; i < count; i++) { rc = bitvec_set_bit(bv, bits[i]); @@ -260,7 +261,7 @@ * \return integer value retrieved from bit vector */ int bitvec_get_uint(struct bitvec *bv, unsigned int num_bits) { - int i; + unsigned int i; unsigned int ui = 0; for (i = 0; i < num_bits; i++) { @@ -603,7 +604,7 @@ * \returns Number of consecutive bits of \p b in \p bv and cur_bit will * \go to cur_bit + number of consecutive bit */ -unsigned bitvec_rl_curbit(struct bitvec *bv, bool b, int max_bits) +unsigned bitvec_rl_curbit(struct bitvec *bv, bool b, unsigned int max_bits) { unsigned i = 0; unsigned j = 8; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34f65cda83bcd7050bd0cc0fb9e5cb5d33a09086 Gerrit-Change-Number: 26810 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

3
3
0 0

Change in libosmocore[master]: utils: Fix -Wsign-compare warnings

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26811 ) Change subject: utils: Fix -Wsign-compare warnings ...................................................................... utils: Fix -Wsign-compare warnings Change-Id: I8b1118ca519b0a419a42eab8b7d4ba9e26a0bab5 --- M include/osmocom/core/utils.h M src/utils.c 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/26811/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 1fdb0eb..327aa3d 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -40,7 +40,7 @@ /*! A mapping between human-readable string and numeric value */ struct value_string { - int value; /*!< numeric value */ + uint32_t value; /*!< numeric value */ const char *str; /*!< human-readable string */ }; @@ -57,7 +57,7 @@ int osmo_bcd2str(char *dst, size_t dst_size, const uint8_t *bcd, int start_nibble, int end_nibble, bool allow_hex); int osmo_str2bcd(uint8_t *dst, size_t dst_size, const char *digits, int start_nibble, int end_nibble, bool allow_hex); -int osmo_hexparse(const char *str, uint8_t *b, int max_len); +int osmo_hexparse(const char *str, uint8_t *b, unsigned int max_len); char *osmo_ubit_dump_buf(char *buf, size_t buf_len, const uint8_t *bits, unsigned int len); char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); @@ -323,7 +323,7 @@ _needed = FUNC_BUF(_str, _len, ## FUNC_BUF_ARGS); \ if (_needed < 0) \ goto OSMO_NAME_C_on_error; \ - if (_needed < _len) \ + if ((unsigned int) _needed < _len) \ return _str; \ _len = _needed + 1; \ if (_str) \ diff --git a/src/utils.c b/src/utils.c index bec4b75..357ed53 100644 --- a/src/utils.c +++ b/src/utils.c @@ -202,7 +202,7 @@ if (end_nibble & 1) end_nibble++; } - if ((end_nibble / 2) > dst_size) + if ((unsigned int) (end_nibble / 2) > dst_size) return -ENOMEM; for (nibble_i = start_nibble; nibble_i < end_nibble; nibble_i++) { @@ -237,7 +237,7 @@ * \param[in] max_len maximum space in output buffer * \returns number of parsed octets, or -1 on error */ -int osmo_hexparse(const char *str, uint8_t *b, int max_len) +int osmo_hexparse(const char *str, uint8_t *b, unsigned int max_len) { char c; @@ -312,7 +312,7 @@ for (i = 0; i < len; i++) { const char *delimp = delim; int len_remain = out_buf_size - (cur - out_buf) - 1; - if (len_remain < (2 + delim_len) + if (len_remain < (int) (2 + delim_len) && !(!delim_after_last && i == (len - 1) && len_remain >= 2)) break; @@ -340,7 +340,7 @@ */ char *osmo_ubit_dump_buf(char *buf, size_t buf_len, const uint8_t *bits, unsigned int len) { - int i; + unsigned int i; if (len > buf_len-1) len = buf_len-1; @@ -1222,7 +1222,7 @@ int64_t precision_factor; int64_t integer_max; int64_t decimal_max; - int i; + unsigned int i; OSMO_ASSERT(val); *val = 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b1118ca519b0a419a42eab8b7d4ba9e26a0bab5 Gerrit-Change-Number: 26811 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Pablo Neira Ayuso <pablo(a)gnumonks.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

3
3
0 0

2025

2024

2023

2022

gerrit-log