[MERGED] osmo-bsc[master]: libcommon: eliminate bsc_version.c

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: libcommon: eliminate bsc_version.c
..


libcommon: eliminate bsc_version.c

Move the copyright string into osmo_bsc_main.c. No other users of it exist.

Change-Id: I7f48924f484e4e4b98be4ca8bee253e6ea9c0576
---
M src/libcommon/Makefile.am
D src/libcommon/bsc_version.c
M src/osmo-bsc/osmo_bsc_main.c
3 files changed, 7 insertions(+), 33 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am
index 9f7e7b9..af578a2 100644
--- a/src/libcommon/Makefile.am
+++ b/src/libcommon/Makefile.am
@@ -20,7 +20,6 @@
$(NULL)
 
 libcommon_a_SOURCES = \
-   bsc_version.c \
common_vty.c \
debug.c \
gsm_data.c \
diff --git a/src/libcommon/bsc_version.c b/src/libcommon/bsc_version.c
deleted file mode 100644
index f0369bf..000
--- a/src/libcommon/bsc_version.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Hold the copyright and version string */
-/* (C) 2010-2016 by Harald Welte 
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see .
- *
- */
-
-#include "../../bscconfig.h"
-
-const char *openbsc_copyright =
-   "Copyright (C) 2008-2016 Harald Welte, Holger Freyther\r\n"
-   "Contributions by Daniel Willmann, Jan Lübbe, Stefan Schmidt\r\n"
-   "Dieter Spaar, Andreas Eversberg, Sylvain Munaut, Neels Hofmeyr\r\n\r\n"
-   "License AGPLv3+: GNU AGPL version 3 or later 
\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";
-
-
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 3deb369..db8c4f8 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -62,7 +62,6 @@
 struct gsm_network *bsc_gsmnet = 0;
 static const char *config_file = "osmo-bsc.cfg";
 static const char *rf_ctrl = NULL;
-extern const char *openbsc_copyright;
 static int daemonize = 0;
 static struct llist_head access_lists;
 
@@ -151,6 +150,13 @@
 
 static struct vty_app_info vty_info = {
.name   = "OsmoBSC",
+   .copyright  =
+   "Copyright (C) 2008-2018 Harald Welte, Holger Freyther\r\n"
+   "Contributions by Daniel Willmann, Jan Lübbe, Stefan Schmidt\r\n"
+   "Dieter Spaar, Andreas Eversberg, Sylvain Munaut, Neels Hofmeyr\r\n\r\n"
+   "License AGPLv3+: GNU AGPL version 3 or later 
\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",
.version= PACKAGE_VERSION,
.go_parent_cb   = bsc_vty_go_parent,
.is_config_node = bsc_vty_is_config_node,
@@ -218,7 +224,6 @@
/* enable filters */
 
/* This needs to precede handle_options() */
-   vty_info.copyright = openbsc_copyright;
vty_init(_info);
bsc_vty_init(bsc_gsmnet);
bsc_msg_lst_vty_init(tall_bsc_ctx, _lists, BSC_NODE);

-- 
To view, visit https://gerrit.osmocom.org/6428
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f48924f484e4e4b98be4ca8bee253e6ea9c0576
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 

osmo-bsc[master]: libcommon: eliminate bsc_version.c

[Harald Welte]

Patch Set 3: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/6428
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7f48924f484e4e4b98be4ca8bee253e6ea9c0576
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

osmo-bsc[master]: libcommon: eliminate bsc_version.c

[Vadim Yanitskiy]

Patch Set 3: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/6428
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7f48924f484e4e4b98be4ca8bee253e6ea9c0576
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-HasComments: No

[PATCH] osmo-bsc[master]: libcommon: eliminate bsc_version.c

[Neels Hofmeyr]

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6428

to look at the new patch set (#3).

libcommon: eliminate bsc_version.c

Move the copyright string into osmo_bsc_main.c. No other users of it exist.

Change-Id: I7f48924f484e4e4b98be4ca8bee253e6ea9c0576
---
M src/libcommon/Makefile.am
D src/libcommon/bsc_version.c
M src/osmo-bsc/osmo_bsc_main.c
3 files changed, 7 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/6428/3

diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am
index 9f7e7b9..af578a2 100644
--- a/src/libcommon/Makefile.am
+++ b/src/libcommon/Makefile.am
@@ -20,7 +20,6 @@
$(NULL)
 
 libcommon_a_SOURCES = \
-   bsc_version.c \
common_vty.c \
debug.c \
gsm_data.c \
diff --git a/src/libcommon/bsc_version.c b/src/libcommon/bsc_version.c
deleted file mode 100644
index f0369bf..000
--- a/src/libcommon/bsc_version.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Hold the copyright and version string */
-/* (C) 2010-2016 by Harald Welte 
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see .
- *
- */
-
-#include "../../bscconfig.h"
-
-const char *openbsc_copyright =
-   "Copyright (C) 2008-2016 Harald Welte, Holger Freyther\r\n"
-   "Contributions by Daniel Willmann, Jan Lübbe, Stefan Schmidt\r\n"
-   "Dieter Spaar, Andreas Eversberg, Sylvain Munaut, Neels Hofmeyr\r\n\r\n"
-   "License AGPLv3+: GNU AGPL version 3 or later 
\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";
-
-
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 3deb369..db8c4f8 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -62,7 +62,6 @@
 struct gsm_network *bsc_gsmnet = 0;
 static const char *config_file = "osmo-bsc.cfg";
 static const char *rf_ctrl = NULL;
-extern const char *openbsc_copyright;
 static int daemonize = 0;
 static struct llist_head access_lists;
 
@@ -151,6 +150,13 @@
 
 static struct vty_app_info vty_info = {
.name   = "OsmoBSC",
+   .copyright  =
+   "Copyright (C) 2008-2018 Harald Welte, Holger Freyther\r\n"
+   "Contributions by Daniel Willmann, Jan Lübbe, Stefan Schmidt\r\n"
+   "Dieter Spaar, Andreas Eversberg, Sylvain Munaut, Neels Hofmeyr\r\n\r\n"
+   "License AGPLv3+: GNU AGPL version 3 or later 
\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",
.version= PACKAGE_VERSION,
.go_parent_cb   = bsc_vty_go_parent,
.is_config_node = bsc_vty_is_config_node,
@@ -218,7 +224,6 @@
/* enable filters */
 
/* This needs to precede handle_options() */
-   vty_info.copyright = openbsc_copyright;
vty_init(_info);
bsc_vty_init(bsc_gsmnet);
bsc_msg_lst_vty_init(tall_bsc_ctx, _lists, BSC_NODE);

-- 
To view, visit https://gerrit.osmocom.org/6428
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7f48924f484e4e4b98be4ca8bee253e6ea9c0576
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder