neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-upf/+/29213 )
Change subject: osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
......................................................................
osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
Fix for building on opensuse 15.4 with GCC 7.5.0+r278197:
osmo_pfcp_tool_main.c:219:15: error: initializer element is not constant
.copyright = osmo_pfcp_tool_copyright,
The variable is only used once, so move its contents directly into the
struct vty_app_info, like it is done in osmo_upf_main.c.
Fixes: OS#5655
Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
---
M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
index 43c3b45..e950f7f 100644
--- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
+++ b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
@@ -206,17 +206,16 @@
}
}
-static const char * const osmo_pfcp_tool_copyright =
- "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for
testing\r\n"
- "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH
<[email protected]>\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 struct vty_app_info pfcp_tool_vty_app_info = {
.name = "osmo-pfcp-tool",
.version = PACKAGE_VERSION,
- .copyright = osmo_pfcp_tool_copyright,
+ .copyright =
+ "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for
testing\r\n"
+ "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH
<[email protected]>\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 pfcp_tool_default_categories[] = {
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29213
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
Gerrit-Change-Number: 29213
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <[email protected]>
Gerrit-MessageType: merged
