Merge pull request #23 from Hoikas/fix_to_buffer

zrax · web-flow · commit 8bcd9bb9f2ea · 2022-06-06T20:41:29.000-07:00
Fix `ST::string::to_buffer` always giving latin_1.
diff --git a/include/st_string.h b/include/st_string.h
@@ -1070,8 +1070,8 @@ namespace ST
         {
             if (utf8)
                 result = to_utf8();
-
-            result = to_latin_1(substitute_out_of_range);
+            else
+                result = to_latin_1(substitute_out_of_range);
         }
 
         ST_DEPRECATED_IN_3_0("use to_buffer(char_buffer &, bool, bool) instead")
@@ -1080,8 +1080,8 @@ namespace ST
         {
             if (utf8)
                 result = to_utf8();
-
-            result = to_latin_1(validation == substitute_invalid);
+            else
+                result = to_latin_1(validation == substitute_invalid);
         }
 
         void to_buffer(utf16_buffer &result) const

Original file line number	Diff line number	Diff line change
`@@ -1070,8 +1070,8 @@ namespace ST`
`1070`	`1070`	`{`
`1071`	`1071`	`if (utf8)`
`1072`	`1072`	`result = to_utf8();`
`1073`		`-`
`1074`		`- result = to_latin_1(substitute_out_of_range);`
	`1073`	`+ else`
	`1074`	`+ result = to_latin_1(substitute_out_of_range);`
`1075`	`1075`	`}`
`1076`	`1076`
`1077`	`1077`	`ST_DEPRECATED_IN_3_0("use to_buffer(char_buffer &, bool, bool) instead")`
`@@ -1080,8 +1080,8 @@ namespace ST`
`1080`	`1080`	`{`
`1081`	`1081`	`if (utf8)`
`1082`	`1082`	`result = to_utf8();`
`1083`		`-`
`1084`		`- result = to_latin_1(validation == substitute_invalid);`
	`1083`	`+ else`
	`1084`	`+ result = to_latin_1(validation == substitute_invalid);`
`1085`	`1085`	`}`
`1086`	`1086`
`1087`	`1087`	`void to_buffer(utf16_buffer &result) const`