From 826fd40f8d3f1b747d7a5318827721d806404a5f Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Sat, 15 Oct 2022 21:11:48 +1100
Subject: [PATCH] nothing to see
---
src/lib66/instance/instance_check.c | 2 +-
src/lib66/instance/instance_create.c | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/lib66/instance/instance_check.c b/src/lib66/instance/instance_check.c
index f01ce8c7..024bc999 100644
--- a/src/lib66/instance/instance_check.c
+++ b/src/lib66/instance/instance_check.c
@@ -23,7 +23,7 @@ int instance_check(char const *svname)
{
log_flow() ;
- int r ;
+ int r = 0 ;
r = get_len_until(svname,'@') ;
// avoid empty value after the instance template name
if (strlen(svname+r) <= 1 && r > 0) return 0 ;
diff --git a/src/lib66/instance/instance_create.c b/src/lib66/instance/instance_create.c
index a4534a56..5a36adeb 100644
--- a/src/lib66/instance/instance_create.c
+++ b/src/lib66/instance/instance_create.c
@@ -26,6 +26,7 @@ int instance_create(stralloc *sasv,char const *svname, char const *regex, int le
{
log_flow() ;
+ int e = 0 ;
char const *copy ;
size_t tlen = len + 1 ;
@@ -39,11 +40,16 @@ int instance_create(stralloc *sasv,char const *svname, char const *regex, int le
log_warnu("replace instance character for service: ",svname) ;
goto err ;
}
- if (!stralloc_copy(sasv,&tmp)) goto err ;
- stralloc_free(&tmp) ;
- return 1 ;
+ stralloc_0(&tmp) ;
+
+ sasv->len = 0 ;
+
+ if (!auto_stra(sasv, tmp.s))
+ goto err ;
+
+ e = 1 ;
err:
stralloc_free(&tmp) ;
- return 0 ;
+ return e ;
}
--
GitLab