X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ast2firm.c;h=c85a8a10241d7fd3921f97397a628488001c098b;hb=47b73b80e0b34b1e716253384d0a7c56f2a5e268;hp=9c150b93288ff42141f48647abdc3e69091214ce;hpb=766a6ccd27b2004800eea73eeeafea7bdee8ed5c;p=cparser

diff --git a/ast2firm.c b/ast2firm.c
index 9c150b9..c85a8a1 100644
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -1103,14 +1103,12 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
  */
 static ir_node *string_to_firm(source_position_t const *const src_pos, char const *const id_prefix, string_encoding_t const enc, string_t const *const value)
 {
-	size_t            slen;
-	ir_type          *elem_type;
-	ir_initializer_t *initializer;
+	size_t            const slen        = get_string_len(enc, value) + 1;
+	ir_initializer_t *const initializer = create_initializer_compound(slen);
+	ir_type          *      elem_type;
 	switch (enc) {
 	case STRING_ENCODING_CHAR: {
-		slen        = value->size + 1;
-		elem_type   = ir_type_char;
-		initializer = create_initializer_compound(slen);
+		elem_type = ir_type_char;
 
 		ir_mode *const mode = get_type_mode(elem_type);
 		char const    *p    = value->begin;
@@ -1123,9 +1121,7 @@ static ir_node *string_to_firm(source_position_t const *const src_pos, char cons
 	}
 
 	case STRING_ENCODING_WIDE: {
-		slen        = wstrlen(value) + 1;
-		elem_type   = ir_type_wchar_t;
-		initializer = create_initializer_compound(slen);
+		elem_type = ir_type_wchar_t;
 
 		ir_mode *const mode = get_type_mode(elem_type);
 		char const    *p    = value->begin;