[MERGED] libosmo-netif[master]: osmux: use uint8_t everywhere for batch_factor

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged.

Change subject: osmux: use uint8_t everywhere for batch_factor
......................................................................


osmux: use uint8_t everywhere for batch_factor

Change-Id: I9fcc8e94b2fcd843b10cb3f8f009f2348eb3a4af
---
M src/osmux.c
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmux.c b/src/osmux.c
index 5655269..ae0bf26 100644
--- a/src/osmux.c
+++ b/src/osmux.c
@@ -53,7 +53,7 @@
 	return osmo_amr_bytes(osmuxh->amr_ft) * (osmuxh->ctr+1);
 }
 
-static uint32_t osmux_ft_dummy_size(uint8_t amr_ft, uint32_t batch_factor)
+static uint32_t osmux_ft_dummy_size(uint8_t amr_ft, uint8_t batch_factor)
 {
 	return sizeof(struct osmux_hdr) + (osmo_amr_bytes(amr_ft) * batch_factor);
 }
@@ -307,7 +307,7 @@
 	return 0;
 }
 
-static void osmux_encode_dummy(struct osmux_batch *batch, uint32_t batch_factor,
+static void osmux_encode_dummy(struct osmux_batch *batch, uint8_t batch_factor,
 			       struct osmux_input_state *state)
 {
 	struct osmux_hdr *osmuxh;
@@ -331,7 +331,7 @@
 }
 
 static struct msgb *osmux_build_batch(struct osmux_batch *batch,
-				      uint32_t batch_size, uint32_t batch_factor)
+				      uint32_t batch_size, uint8_t batch_factor)
 {
 	struct msgb *batch_msg;
 	struct osmux_circuit *circuit;
@@ -523,7 +523,7 @@
 
 static struct osmux_circuit *
 osmux_batch_add_circuit(struct osmux_batch *batch, int ccid, int dummy,
-			int batch_factor)
+			uint8_t batch_factor)
 {
 	struct osmux_circuit *circuit;
 
@@ -563,7 +563,7 @@
 }
 
 static int
-osmux_batch_add(struct osmux_batch *batch, int batch_factor, struct msgb *msg,
+osmux_batch_add(struct osmux_batch *batch, uint32_t batch_factor, struct msgb *msg,
 		struct rtp_hdr *rtph, int ccid)
 {
 	int bytes = 0, amr_payload_len;

-- 
To view, visit https://gerrit.osmocom.org/2406
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fcc8e94b2fcd843b10cb3f8f009f2348eb3a4af
Gerrit-PatchSet: 2
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>