aboutsummaryrefslogtreecommitdiffstats
path: root/src/fsm.c
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-03-31 16:30:25 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2018-04-09 17:57:15 +0200
commit71f76a1f42958ca6dca26669daf41a568d694c18 (patch)
treebd7a5532a46f55b690172b64d8136693a94caa52 /src/fsm.c
parent975ee6bd44ca18c82ecf5aea91c361baf248a0ff (diff)
fsm: id: properly set name in case of NULL id
Since alloc relies on osmo_fsm_inst_update_id() to set the name, never skip that. In osmo_fsm_inst_alloc(), we allow passing a NULL id, and in osmo_fsm_inst_update_id(), we set the name without id if id is NULL. Change-Id: I6d6b09a811b82770818f19b189a57d9fc4a8133b
Diffstat (limited to 'src/fsm.c')
-rw-r--r--src/fsm.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/fsm.c b/src/fsm.c
index 88de0116..9bbf870e 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -263,11 +263,9 @@ struct osmo_fsm_inst *osmo_fsm_inst_alloc(struct osmo_fsm *fsm, void *ctx, void
fi->log_level = log_level;
osmo_timer_setup(&fi->timer, fsm_tmr_cb, fi);
- if (id) {
- if (osmo_fsm_inst_update_id(fi, id) < 0) {
- talloc_free(fi);
- return NULL;
- }
+ if (osmo_fsm_inst_update_id(fi, id) < 0) {
+ talloc_free(fi);
+ return NULL;
}
INIT_LLIST_HEAD(&fi->proc.children);