From f80e97346b0da9fab3d60b46bdcf0a0d702f97c9 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 16 Nov 2017 13:42:41 -0800 Subject: [PATCH] i965: Simplify annotation_insert_error() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Samuel Iglesias Gonsálvez Reviewed-by: Kenneth Graunke --- src/intel/compiler/intel_asm_annotation.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/intel/compiler/intel_asm_annotation.c b/src/intel/compiler/intel_asm_annotation.c index b07a545..26ab4b9 100644 --- a/src/intel/compiler/intel_asm_annotation.c +++ b/src/intel/compiler/intel_asm_annotation.c @@ -159,8 +159,6 @@ void annotation_insert_error(struct annotation_info *annotation, unsigned offset, const char *error) { - struct annotation *ann; - if (!annotation->ann_count) return; @@ -175,7 +173,6 @@ annotation_insert_error(struct annotation_info *annotation, unsigned offset, for (int i = 0; i < annotation->ann_count; i++) { struct annotation *cur = &annotation->ann[i]; struct annotation *next = &annotation->ann[i + 1]; - ann = cur; if (next->offset <= offset) continue; @@ -190,11 +187,11 @@ annotation_insert_error(struct annotation_info *annotation, unsigned offset, next->block_start = NULL; annotation->ann_count++; } - break; - } - if (ann->error) - ralloc_strcat(&ann->error, error); - else - ann->error = ralloc_strdup(annotation->mem_ctx, error); + if (cur->error) + ralloc_strcat(&cur->error, error); + else + cur->error = ralloc_strdup(annotation->mem_ctx, error); + return; + } } -- 2.7.4