[PATCH] fix some 'else' indenting styles

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/OpenBSC@lists.osmocom.org/.

Neels Hofmeyr nhofmeyr at sysmocom.de
Wed Nov 4 23:28:58 UTC 2015


---
 openbsc/src/gprs/gprs_sgsn.c   | 2 +-
 openbsc/src/libbsc/bsc_vty.c   | 3 +--
 openbsc/src/libmsc/gsm_04_08.c | 9 +++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c
index c4dc9d7..982fb92 100644
--- a/openbsc/src/gprs/gprs_sgsn.c
+++ b/openbsc/src/gprs/gprs_sgsn.c
@@ -576,7 +576,7 @@ static void drop_one_pdp(struct sgsn_pdp_ctx *pdp)
 {
 	if (pdp->mm->mm_state == GMM_REGISTERED_NORMAL)
 		gsm48_tx_gsm_deact_pdp_req(pdp, GSM_CAUSE_NET_FAIL);
-	else  {
+	else {
 		/* FIXME: GPRS paging in case MS is SUSPENDED */
 		LOGPDPCTXP(LOGL_NOTICE, pdp, "Hard-dropping PDP ctx due to GGSN "
 			"recovery\n");
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 24bae97..8141b21 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -2174,8 +2174,7 @@ DEFUN(cfg_bts_rach_ac_class, cfg_bts_rach_ac_class_cmd,
 			bts->si_common.rach_control.t3 &= ~(0x1 << control_class);
 		else
 			bts->si_common.rach_control.t3 |= (0x1 << control_class);
-	else
-		if (allowed)
+	else if (allowed)
 			bts->si_common.rach_control.t2 &= ~(0x1 << (control_class - 8));
 		else
 			bts->si_common.rach_control.t2 |= (0x1 << (control_class - 8));
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 7db7586..c8aea06 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -806,8 +806,7 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn)
 			ptr8[7] = bcdify(tzunits);
 			/* Set negative time */
 			ptr8[7] |= 0x08;
-		}
-		else {
+		} else {
 			tzunits = bts->tz.hr*4;
 			tzunits = tzunits + (bts->tz.mn/15);
 			ptr8[7] = bcdify(tzunits);
@@ -815,8 +814,7 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn)
 		/* Convert DST value */
 		if (bts->tz.dst >= 0 && bts->tz.dst <= 2)
 			dst = bts->tz.dst;
-	}
-	else {
+	} else {
 		/* Need to get GSM offset and convert into 15 min units */
 		/* This probably breaks if gmtoff returns a value not evenly divisible by 15? */
 		local_time = localtime(&cur_t);
@@ -831,8 +829,7 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn)
 			ptr8[7] = bcdify(tzunits);
 			/* Flip it to negative */
 			ptr8[7] |= 0x08;
-		}
-		else
+		} else
 			ptr8[7] = bcdify(tzunits);
 
 		/* Does not support DST +2 */
-- 
2.1.4




More information about the OpenBSC mailing list