fixeria has uploaded this change for review.

View Change

rlcmac: refactor gprs_rlcmac_rlc_ul_window_move_window()

* drop unused variable 'i' (fixes -Wunused-but-set-variable)
* reduce nesting in the for-loop

Change-Id: Ic0efd2f84a17d287b73261c102bca84e8274bb2a
---
M src/rlcmac/rlc_window_ul.c
1 file changed, 18 insertions(+), 8 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/61/35861/1

diff --git a/src/rlcmac/rlc_window_ul.c b/src/rlcmac/rlc_window_ul.c
index af1c32b..e8c07e6 100644
--- a/src/rlcmac/rlc_window_ul.c
+++ b/src/rlcmac/rlc_window_ul.c
@@ -291,18 +291,16 @@
 unsigned int gprs_rlcmac_rlc_ul_window_move_window(struct gprs_rlcmac_rlc_ul_window *ulw)
 {
 	struct gprs_rlcmac_rlc_window *w = rlc_ulw_as_w(ulw);
-	unsigned int i;
-	uint16_t bsn;
 	unsigned int moved = 0;
+	uint16_t bsn;
 
-	for (i = 0, bsn = gprs_rlcmac_rlc_ul_window_v_a(ulw);
+	for (bsn = gprs_rlcmac_rlc_ul_window_v_a(ulw);
 	     bsn != gprs_rlcmac_rlc_ul_window_v_s(ulw);
-	     i++, bsn = gprs_rlcmac_rlc_window_mod_sns_bsn(w, bsn + 1)) {
-		if (gprs_rlcmac_rlc_v_b_is_acked(&ulw->v_b, bsn)) {
-			gprs_rlcmac_rlc_v_b_mark_invalid(&ulw->v_b, bsn);
-			moved += 1;
-		} else
+	     bsn = gprs_rlcmac_rlc_window_mod_sns_bsn(w, bsn + 1)) {
+		if (!gprs_rlcmac_rlc_v_b_is_acked(&ulw->v_b, bsn))
 			break;
+		moved += 1;
+		gprs_rlcmac_rlc_v_b_mark_invalid(&ulw->v_b, bsn);
 	}
 
 	return moved;

To view, visit change 35861. To unsubscribe, or for help writing mail filters, visit settings.