osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27465 )
Change subject: treewide: tweak includes ......................................................................
treewide: tweak includes
Order them alphabetically and remove empty lines between them, that's the easiest way for me to keep them consistent.
Related: SYS#5560 Change-Id: I1a7b95ccb0c87fd53645c72f0c02449e8403043b --- M include/osmocom/bsc_nat/bsc_nat.h M include/osmocom/bsc_nat/vty.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/logging.c M src/osmo-bsc-nat/main.c M src/osmo-bsc-nat/vty.c 7 files changed, 17 insertions(+), 32 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/65/27465/1
diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 3c77c23..a1e3da8 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -21,7 +21,6 @@ #include <osmocom/core/fsm.h> #include <osmocom/sigtran/sccp_sap.h>
- struct bsc_nat_sccp_inst { uint32_t ss7_id; struct osmo_ss7_instance *ss7_inst; diff --git a/include/osmocom/bsc_nat/vty.h b/include/osmocom/bsc_nat/vty.h index 9a842b5..8fe35a2 100644 --- a/include/osmocom/bsc_nat/vty.h +++ b/include/osmocom/bsc_nat/vty.h @@ -16,7 +16,6 @@ * along with this program. If not, see http://www.gnu.org/lienses/. * */ - #pragma once
#include <osmocom/vty/vty.h> diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index f9867c1..7741184 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -18,11 +18,10 @@ */
#include "config.h" - -#include <osmocom/core/talloc.h> -#include <osmocom/core/utils.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h>
struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 085cafd..3e10749 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -18,21 +18,16 @@ */
#include "config.h" - #include <errno.h> -#include <stdint.h> - -#include <osmocom/core/fsm.h> -#include <osmocom/core/select.h> - -#include <osmocom/gsm/gsm0808.h> - -#include <osmocom/sigtran/osmo_ss7.h> -#include <osmocom/sigtran/sccp_helpers.h> - #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/core/fsm.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/gsm0808.h> +#include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sigtran/sccp_helpers.h> +#include <stdint.h>
#define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ #define DEFAULT_PC_CN "0.23.3" /* same as default for OsmoBSC */ diff --git a/src/osmo-bsc-nat/logging.c b/src/osmo-bsc-nat/logging.c index 5ada8c2..653789b 100644 --- a/src/osmo-bsc-nat/logging.c +++ b/src/osmo-bsc-nat/logging.c @@ -16,11 +16,10 @@ * along with this program. If not, see http://www.gnu.org/lienses/. * */ +#include <osmocom/bsc_nat/logging.h> #include <osmocom/core/logging.h> #include <osmocom/core/utils.h>
-#include <osmocom/bsc_nat/logging.h> - static const struct log_info_cat log_cat[] = { [DMAIN] = { .name = "DMAIN", diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 7e9696e..ef4b78d 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -18,9 +18,11 @@ */
#include "config.h" - #include <getopt.h> - +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/vty.h> #include <osmocom/core/application.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_sap.h> @@ -30,11 +32,6 @@ #include <osmocom/vty/ports.h> #include <osmocom/vty/telnet_interface.h>
-#include <osmocom/bsc_nat/bsc_nat.h> -#include <osmocom/bsc_nat/bsc_nat_fsm.h> -#include <osmocom/bsc_nat/logging.h> -#include <osmocom/bsc_nat/vty.h> - static const char *const copyright = "OsmoBSCNAT - Osmocom BSC NAT\r\n" "Copyright (C) 2021 by sysmocom s.f.m.c. GmbH info@sysmocom.de\r\n" diff --git a/src/osmo-bsc-nat/vty.c b/src/osmo-bsc-nat/vty.c index 41681d4..0dd0e15 100644 --- a/src/osmo-bsc-nat/vty.c +++ b/src/osmo-bsc-nat/vty.c @@ -18,15 +18,12 @@ */
#include "config.h" - -#include <unistd.h> - -#include <osmocom/vty/telnet_interface.h> -#include <osmocom/vty/logging.h> -#include <osmocom/vty/command.h> - #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/vty.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> +#include <unistd.h>
static struct cmd_node bsc_nat_node = { BSC_NAT_NODE,
-
osmith