X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firargs.c;h=4713de40d3b5554a4c878f2c0b89a8d0b1133810;hb=bf3972bf795dc4ff83de4f14a96e520c6533427b;hp=300a51d476e5e97f308d5a0cead7e90255ff7281;hpb=30e77781cac93dae2e639155ab3955befa6f49fb;p=libfirm

diff --git a/ir/ir/irargs.c b/ir/ir/irargs.c
index 300a51d47..4713de40d 100644
--- a/ir/ir/irargs.c
+++ b/ir/ir/irargs.c
@@ -90,11 +90,7 @@ static int firm_emit_dbg(lc_appendable_t *app,
 	ir_node *irn = arg->v_ptr;
 	dbg_info *dbg = get_irn_dbg_info(irn);
 
-	buf[0] = '\0';
-	if (dbg && __dbg_info_snprint) {
-		if (__dbg_info_snprint(buf, sizeof(buf), dbg) <= 0)
-			buf[0] = '\0';
-	}
+	ir_dbg_info_snprint(buf, sizeof(buf), dbg);
 	return lc_arg_append(app, occ, buf, strlen(buf));
 }
 
@@ -155,8 +151,8 @@ static int firm_emit(lc_appendable_t *app,
 		switch (occ->conversion) {
 		case 'B':
 			block = is_no_Block(X) ? get_nodes_block(X) : X;
-			snprintf(buf, sizeof(buf), "%s%s%s", A("irn"), get_irn_opname(block),
-				get_mode_name(get_irn_mode(block)));
+			snprintf(buf, sizeof(buf), "%s%s %s", A("irn"),
+			         get_irn_opname(block), get_mode_name(get_irn_mode(block)));
 			snprintf(add, sizeof(add), "[%ld]", get_irn_node_nr(block));
 			break;
 		case 'N':
@@ -169,16 +165,16 @@ static int firm_emit(lc_appendable_t *app,
 					tarval_snprintf(tv_buf, sizeof(tv_buf), tv);
 				else
 					strncpy(tv_buf, "(NULL)", sizeof(tv_buf));
-				snprintf(buf, sizeof(buf), "%s%s%s<%s>", A("irn"), get_irn_opname(X),
+				snprintf(buf, sizeof(buf), "%s%s %s<%s>", A("irn"), get_irn_opname(X),
 					get_mode_name(get_irn_mode(X)), tv_buf);
 			} else if (is_SymConst_addr_ent(X)) {
-				snprintf(buf, sizeof(buf), "%s%s%s[%s]", A("irn"), get_irn_opname(X),
+				snprintf(buf, sizeof(buf), "%s%s %s[%s]", A("irn"), get_irn_opname(X),
 				get_mode_name(get_irn_mode(X)), get_entity_name(get_SymConst_entity(X)));
 			} else if (is_Sel(X)) {
-				snprintf(buf, sizeof(buf), "%s%s%s[%s]", A("irn"), get_irn_opname(X),
+				snprintf(buf, sizeof(buf), "%s%s %s[%s]", A("irn"), get_irn_opname(X),
 				get_mode_name(get_irn_mode(X)), get_entity_name(get_Sel_entity(X)));
 			} else {
-				snprintf(buf, sizeof(buf), "%s%s%s", A("irn"), get_irn_opname(X),
+				snprintf(buf, sizeof(buf), "%s%s %s", A("irn"), get_irn_opname(X),
 				get_mode_name(get_irn_mode(X)));
 			}
 			snprintf(add, sizeof(add), "[%ld:%d]", get_irn_node_nr(X), get_irn_idx(X));
@@ -203,12 +199,12 @@ static int firm_emit(lc_appendable_t *app,
 		for (i = 0; i < n; ++i) {
 			ent = get_compound_graph_path_node(X, i);
 
-			strncat(buf, ".", sizeof(buf));
-			strncat(buf, get_entity_name(ent), sizeof(buf));
+			strncat(buf, ".", sizeof(buf)-1);
+			strncat(buf, get_entity_name(ent), sizeof(buf)-1);
 			if (is_Array_type(get_entity_owner(ent))) {
 				snprintf(add, sizeof(add), "[%d]",
 					get_compound_graph_path_array_index(X, i));
-				strncat(buf, add, sizeof(buf));
+				strncat(buf, add, sizeof(buf)-1);
 			}
 		}
 		add[0] = '\0';
@@ -225,7 +221,7 @@ static int firm_emit(lc_appendable_t *app,
 	}
 
 	if (occ->flag_plus)
-		strncat(buf, add, sizeof(buf));
+		strncat(buf, add, sizeof(buf)-1);
 
 	return lc_arg_append(app, occ, buf, strlen(buf));