Change in osmo-bts[master]: vty: dont put a colon after vty_out in cfg_out macro

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/gerrit-log@lists.osmocom.org/.

dexter gerrit-no-reply at lists.osmocom.org
Tue Feb 16 13:53:44 UTC 2021


dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22927 )

Change subject: vty: dont put a colon after vty_out in cfg_out macro
......................................................................

vty: dont put a colon after vty_out in cfg_out macro

The cfg_out macro is used like a function in the code below its
definition. This means a colon will follow after it is used. When
the vty_out call in the macro already has a colon the final result will
be vty_out(...);;. This works fine as long the macro is not used in one
line if/else if/else constructs without curly braces {}. The compiler
will interpret the double colon as two lines of code and run into an
error then. Lets fix this by removing the colon from the vty_cout in the
macro.

Change-Id: I2c23c38ce892067add0f95f3e504a9c559e24519
---
M src/common/vty.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved



diff --git a/src/common/vty.c b/src/common/vty.c
index f2c7954..d60a2be 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1240,7 +1240,7 @@
 
 /* TODO: generalize and move indention handling to libosmocore */
 #define cfg_out(vty, fmt, args...) \
-	vty_out(vty, "%*s" fmt, indent, "", ##args);
+	vty_out(vty, "%*s" fmt, indent, "", ##args)
 
 static void dump_dpc_meas_params(struct vty *vty, const unsigned int indent,
 				 const struct gsm_power_ctrl_meas_params *mp,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22927
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I2c23c38ce892067add0f95f3e504a9c559e24519
Gerrit-Change-Number: 22927
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210216/aa323c5f/attachment.htm>


More information about the gerrit-log mailing list