neels submitted this change.

View Change


Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved
hnbgw: put copyright into define

Fix the following compile error, seen on ubuntu 18.04 with GCC 7.5.0,
opensuse 15.4 and our OE builds:

hnbgw.c:549:15: error: initializer element is not constant
.copyright = hnbgw_copyright,
^~~~~~~~~~~~~~~

Fixes: 04844415 ("move main() to separate file")
Change-Id: I13b2569a369724e0298b064a0876b95d6dafd9d0
---
M src/osmo-hnbgw/hnbgw.c
1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index 8876580..6bf7b3f 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -491,13 +491,13 @@
return ranap_msg;
}

-static const char * const hnbgw_copyright =
- "OsmoHNBGW - Osmocom Home Node B Gateway implementation\r\n"
- "Copyright (C) 2016-2023 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>\r\n"
- "Contributions by Daniel Willmann, Harald Welte, Neels Hofmeyr\r\n"
- "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
- "This is free software: you are free to change and redistribute it.\r\n"
- "There is NO WARRANTY, to the extent permitted by law.\r\n";
+#define HNBGW_COPYRIGHT \
+ "OsmoHNBGW - Osmocom Home Node B Gateway implementation\r\n" \
+ "Copyright (C) 2016-2023 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>\r\n" \
+ "Contributions by Daniel Willmann, Harald Welte, Neels Hofmeyr\r\n" \
+ "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n" \
+ "This is free software: you are free to change and redistribute it.\r\n" \
+ "There is NO WARRANTY, to the extent permitted by law.\r\n"

static const struct log_info_cat hnbgw_log_cat[] = {
[DMAIN] = {
@@ -546,5 +546,5 @@
.name = "OsmoHNBGW",
.version = PACKAGE_VERSION,
.go_parent_cb = hnbgw_vty_go_parent,
- .copyright = hnbgw_copyright,
+ .copyright = HNBGW_COPYRIGHT,
};

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

Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I13b2569a369724e0298b064a0876b95d6dafd9d0
Gerrit-Change-Number: 32679
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de>
Gerrit-MessageType: merged