fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/28729 )
Change subject: trxcon: l1ctl_server_{start,shutdown}() ->
l1ctl_server_{alloc,free}()
......................................................................
trxcon: l1ctl_server_{start,shutdown}() -> l1ctl_server_{alloc,free}()
l1ctl_server_start() does not actually start the server, it simply
allocates memory and initializes it. l1ctl_server_shutdown() does
the opposite. Let's use more precise symbol names.
Change-Id: Ie039abdff3911c5b566c760b26c31203824c5764
---
M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
M src/host/trxcon/src/l1ctl_server.c
M src/host/trxcon/src/trxcon.c
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
index 003d146..94c0a9c 100644
--- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
+++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h
@@ -54,8 +54,8 @@
void *priv;
};
-struct l1ctl_server *l1ctl_server_start(void *ctx, const struct
l1ctl_server_cfg *cfg);
-void l1ctl_server_shutdown(struct l1ctl_server *server);
+struct l1ctl_server *l1ctl_server_alloc(void *ctx, const struct
l1ctl_server_cfg *cfg);
+void l1ctl_server_free(struct l1ctl_server *server);
int l1ctl_client_send(struct l1ctl_client *client, struct msgb *msg);
void l1ctl_client_conn_close(struct l1ctl_client *client);
diff --git a/src/host/trxcon/src/l1ctl_server.c
b/src/host/trxcon/src/l1ctl_server.c
index 8d57fff..8827900 100644
--- a/src/host/trxcon/src/l1ctl_server.c
+++ b/src/host/trxcon/src/l1ctl_server.c
@@ -206,7 +206,7 @@
talloc_free(client);
}
-struct l1ctl_server *l1ctl_server_start(void *ctx, const struct
l1ctl_server_cfg *cfg)
+struct l1ctl_server *l1ctl_server_alloc(void *ctx, const struct
l1ctl_server_cfg *cfg)
{
struct l1ctl_server *server;
int rc;
@@ -239,7 +239,7 @@
return server;
}
-void l1ctl_server_shutdown(struct l1ctl_server *server)
+void l1ctl_server_free(struct l1ctl_server *server)
{
LOGP(DL1C, LOGL_NOTICE, "Shutdown L1CTL server\n");
diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c
index 7fa774d..1e12293 100644
--- a/src/host/trxcon/src/trxcon.c
+++ b/src/host/trxcon/src/trxcon.c
@@ -563,7 +563,7 @@
.conn_close_cb = &l1ctl_conn_close_cb,
};
- server = l1ctl_server_start(tall_trxcon_ctx, &server_cfg);
+ server = l1ctl_server_alloc(tall_trxcon_ctx, &server_cfg);
if (server == NULL) {
rc = EXIT_FAILURE;
goto exit;
@@ -587,7 +587,7 @@
exit:
if (server != NULL)
- l1ctl_server_shutdown(server);
+ l1ctl_server_free(server);
/* Deinitialize logging */
log_fini();
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28729
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ie039abdff3911c5b566c760b26c31203824c5764
Gerrit-Change-Number: 28729
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
