Osmocom Open Build Service

libosmocore.spec Changed

commit_026551eced6d0b19e7fd0650216204051d0cd739.txt Added

commit_9b1e22d8d5148c66f1bc756806b5153d0f588eee.txt Deleted

libosmocore_1.9.0.120.9b1e.dsc -> libosmocore_1.9.0.122.0265.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmocore
 Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore21, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.9.0.120.9b1e
+Version: 1.9.0.122.0265
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
@@ -35,8 +35,8 @@
  libosmovty-doc deb doc optional arch=all
  libosmovty13 deb libs optional arch=any
 Checksums-Sha1:
- a4b6f461badaf68a16c4802438585b324e073379 1093648 libosmocore_1.9.0.120.9b1e.tar.xz
+ 7fcc118feaccc3cc79e0403eace56d95482b1f36 1093340 libosmocore_1.9.0.122.0265.tar.xz
 Checksums-Sha256:
- c8bebfaaa0ab12d4e3c6866b4e43de6cc7809d85b49ec2131c920f7f687d5c94 1093648 libosmocore_1.9.0.120.9b1e.tar.xz
+ 5e47285cc2b994bd129fcb2aeaef2a733fea8c4b6752a674e2946ca8f11fb42a 1093340 libosmocore_1.9.0.122.0265.tar.xz
 Files:
- 0339f95ff838f7eeab7b7311c24050ad 1093648 libosmocore_1.9.0.120.9b1e.tar.xz
+ 88870f3e8548ab0f8395044343ab3def 1093340 libosmocore_1.9.0.122.0265.tar.xz

libosmocore_1.9.0.120.9b1e.tar.xz/.tarball-version -> libosmocore_1.9.0.122.0265.tar.xz/.tarball-version Changed

libosmocore_1.9.0.120.9b1e.tar.xz/debian/changelog -> libosmocore_1.9.0.122.0265.tar.xz/debian/changelog Changed

libosmocore_1.9.0.120.9b1e.tar.xz/src/gsm/gsm0808_utils.c -> libosmocore_1.9.0.122.0265.tar.xz/src/gsm/gsm0808_utils.c Changed

@@ -2075,25 +2075,12 @@
 	{ 0, NULL }
 };
 
-#define APPEND_THING(func, args...) do { \
-		int remain = buflen - (pos - buf); \
-		int l = func(pos, remain, ##args); \
-		if (l < 0 || l > remain) \
-			pos = buf + buflen; \
-		else \
-			pos += l; \
-		if (l > 0) \
-			total_len += l; \
-	} while(0)
-#define APPEND_STR(fmt, args...) APPEND_THING(snprintf, fmt, ##args)
-#define APPEND_CELL_ID_U(DISCR, U) APPEND_THING(gsm0808_cell_id_u_name, DISCR, U)
-
 char *gsm0808_cell_id_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id *cid)
 {
-	char *pos = buf;
-	int total_len = 0;
-	APPEND_STR("%s:", gsm0808_cell_id_discr_name(cid->id_discr));
-	APPEND_CELL_ID_U(cid->id_discr, &cid->id);
+	struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+
+	OSMO_STRBUF_PRINTF(sb, "%s:", gsm0808_cell_id_discr_name(cid->id_discr));
+	OSMO_STRBUF_APPEND(sb, gsm0808_cell_id_u_name, cid->id_discr, &cid->id);
 	return buf;
 }
 
@@ -2140,30 +2127,31 @@
  */
 int gsm0808_cell_id_list_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id_list2 *cil)
 {
-	char *pos = buf;
-	int total_len = 0;
-	int i;
+	struct osmo_strbuf sb = { .buf = buf, .len = buflen };
 
-	APPEND_STR("%s%u", gsm0808_cell_id_discr_name(cil->id_discr), cil->id_list_len);
+	OSMO_STRBUF_PRINTF(sb, "%s%u",
+			   gsm0808_cell_id_discr_name(cil->id_discr),
+			   cil->id_list_len);
 
 	switch (cil->id_discr) {
 	case CELL_IDENT_BSS:
 	case CELL_IDENT_NO_CELL:
-		return total_len;
+		return sb.chars_needed;
 	default:
 		break;
 	}
 
-	APPEND_STR(":{");
+	OSMO_STRBUF_PRINTF(sb, ":{");
 
-	for (i = 0; i < cil->id_list_len; i++) {
+	for (unsigned int i = 0; i < cil->id_list_len; i++) {
 		if (i)
-			APPEND_STR(", ");
-		APPEND_CELL_ID_U(cil->id_discr, &cil->id_listi);
+			OSMO_STRBUF_PRINTF(sb, ", ");
+		OSMO_STRBUF_APPEND(sb, gsm0808_cell_id_u_name,
+				   cil->id_discr, &cil->id_listi);
 	}
 
-	APPEND_STR("}");
-	return total_len;
+	OSMO_STRBUF_PRINTF(sb, "}");
+	return sb.chars_needed;
 }
 
 /*! Return a human-readable representation of \a cil in a static buffer.
@@ -2185,9 +2173,6 @@
 	return buf;
 }
 
-#undef APPEND_STR
-#undef APPEND_CELL_ID_U
-
 char *gsm0808_channel_type_name_buf(char *buf, size_t buf_len, const struct gsm0808_channel_type *ct)
 {
 	snprintf(buf, buf_len, "ch_indctr=0x%x ch_rate_type=0x%x perm_spch=%s",

libosmocore_1.9.0.120.9b1e.tar.xz/src/vty/utils.c -> libosmocore_1.9.0.122.0265.tar.xz/src/vty/utils.c Changed

Changes of Revision 299