From 049727fd9f7602caf0bc44466ff6492617e09870 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sun, 17 Nov 2019 16:23:50 +0000
Subject: [PATCH] minor change in str-dyn.h

---
 qse/lib/cmn/str-dyn.c |  4 ++++
 qse/lib/cmn/str-dyn.h | 11 +++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/qse/lib/cmn/str-dyn.c b/qse/lib/cmn/str-dyn.c
index 9ae9533b..50a84ab9 100644
--- a/qse/lib/cmn/str-dyn.c
+++ b/qse/lib/cmn/str-dyn.c
@@ -87,6 +87,7 @@ static int mbs_to_wcs (
 #undef cstr_t
 #undef str_sizer_t
 #undef T
+#undef STR_LEN
 #undef strlen
 #undef strncpy
 #undef strxpac
@@ -135,6 +136,7 @@ static int mbs_to_wcs (
 #define cstr_t qse_mcstr_t
 #define str_sizer_t qse_mbs_sizer_t
 #define T(x) QSE_MT(x)
+#define STR_LEN(x) QSE_MBS_LEN(x)
 #define strlen(x) qse_mbslen(x)
 #define strncpy(x,y,z) qse_mbsncpy(x,y,z)
 #define strxpac(x,y) qse_mbsxpac(x,y)
@@ -186,6 +188,7 @@ static int mbs_to_wcs (
 #undef cstr_t
 #undef str_sizer_t
 #undef T
+#undef STR_LEN
 #undef strlen
 #undef strncpy
 #undef strxpac
@@ -234,6 +237,7 @@ static int mbs_to_wcs (
 #define cstr_t qse_wcstr_t
 #define str_sizer_t qse_wcs_sizer_t
 #define T(x) QSE_WT(x)
+#define STR_LEN(x) QSE_WCS_LEN(x)
 #define strlen(x) qse_wcslen(x)
 #define strncpy(x,y,z) qse_wcsncpy(x,y,z)
 #define strxpac(x,y) qse_wcsxpac(x,y)
diff --git a/qse/lib/cmn/str-dyn.h b/qse/lib/cmn/str-dyn.h
index 3a471842..645d7c04 100644
--- a/qse/lib/cmn/str-dyn.h
+++ b/qse/lib/cmn/str-dyn.h
@@ -105,11 +105,7 @@ int str_yield (str_t* str, cstr_t* buf, qse_size_t newcapa)
 		tmp[0] = T('\0');
 	}
 
-	if (buf != QSE_NULL)
-	{
-		buf->ptr = str->val.ptr;
-		buf->len = str->val.len;
-	}
+	if (buf) *buf = str->val;
 
 	str->val.ptr = tmp;
 	str->val.len = 0;
@@ -182,7 +178,7 @@ qse_size_t str_setcapa (str_t* str, qse_size_t capa)
 
 qse_size_t str_getlen (str_t* str)
 {
-	return QSE_MBS_LEN (str);
+	return STR_LEN(str);
 }
 
 qse_size_t str_setlen (str_t* str, qse_size_t len)
@@ -197,8 +193,7 @@ qse_size_t str_setlen (str_t* str, qse_size_t len)
 
 	if (len > str->capa)
 	{
-		if (str_setcapa (str, len) == (qse_size_t)-1) 
-			return (qse_size_t)-1;
+		if (str_setcapa(str, len) == (qse_size_t)-1) return (qse_size_t)-1;
 	}
 
 	while (str->val.len < len) str->val.ptr[str->val.len++] = T(' ');