From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id 146363858422 for ; Fri, 24 Mar 2023 10:35:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 146363858422 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pj1-x102e.google.com with SMTP id x15so1154656pjk.2 for ; Fri, 24 Mar 2023 03:35:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679654128; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=VOY6fubyOzh6iygzKg0b+C5vaikAtGE0VgxgW4wBDfc=; b=GTAv1Ej4oPFs85c3wGhtBpC65/3lS+uv6m6Op3suESMoDHkxYvxTMZjo4fTjfy9p0w q5kibHmoBi8uOqKVhDRHt3+6eFQgPc1C6FT4sm7dYtyuaNLb02Ntt6IWMFyzngcox7KE 2stFZDzh+GKHPPi9ZH+X0RRhh4MNRkSQwYoEm/l2QVXHGlFHYJUcLcEgvmfAySByeChP p9n8YGHamD7Xl/5V3srHTomL3DMgHexDg47L4SrlVIyR8K58VSNlsch2d+vkz32mjtHZ WoeqCw6DTz+YnXMyGOPtfwq0GfxPSeOV48cQdWzfqPdC0vtR0U+RxfaIneRa4iAgQP6j xXLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679654128; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VOY6fubyOzh6iygzKg0b+C5vaikAtGE0VgxgW4wBDfc=; b=asTk284b6cXFtnD4LL4FN/ecNd1xe8ubZ0WVjcZyiiuVpuw/m08tIa9t36ixH/DhJh 7c4u/K2wylCHWGuwVzVnpmW2T8LvhAxp1fX05hV82pNMfLe+4kJXuptPhaUBdasOUBLu 3xpFtg0jSjihmLR+9uz0WjlsaPgkuKUOHWJgmtf2N8JPpNjS6vfx65TdBMPLT9H8FtJc 09UpBqfW4j122E+PvcIRKbT7SQ+NK4Zpc5qmynsRyWikCc3DmYSuaRLMKtnSrrsJvfvJ t2dKwRK0au5YzvCmmHlEtNqHeRNOR8U8LPUPl3nf+fnEKADuJrlpV8vlz0EgS3svEsgw mS/w== X-Gm-Message-State: AO0yUKX98q3aADTifKC20fFFV3L0R6Oaecex2Pbr1KgtJcLIiZ7kwOn/ +s6hm5vU4ekQIJgzMkbQijFf2zGaoSU= X-Google-Smtp-Source: AK7set/quBh+4kHOQLCPQtpjR1xcF4+8nbiBRU+G7nrggpPEd43DEs4QV/BerGN/ar8XYkzLl592tg== X-Received: by 2002:a05:6a20:1aa1:b0:d9:11d2:383f with SMTP id ci33-20020a056a201aa100b000d911d2383fmr2207187pzb.53.1679654127892; Fri, 24 Mar 2023 03:35:27 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id y19-20020a62b513000000b005a75d85c0c7sm13466024pfe.51.2023.03.24.03.35.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 03:35:27 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 541361143B45; Fri, 24 Mar 2023 21:05:25 +1030 (ACDT) Date: Fri, 24 Mar 2023 21:05:25 +1030 From: Alan Modra To: binutils@sourceware.org Subject: Tidy string_ptr increment Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3035.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: I was going to make this vars->string_ptr += strlen (vars->string_ptr) + 1; but figured we ought to be able to trust sprintf return value nowadays. * peicode.h (pe_ILF_make_a_symbol): Use sprintf output to increment string_ptr to end of new string. diff --git a/bfd/peicode.h b/bfd/peicode.h index f1f3ce81533..f16aeca7a1b 100644 --- a/bfd/peicode.h +++ b/bfd/peicode.h @@ -576,7 +576,7 @@ pe_ILF_make_a_symbol (pe_ILF_vars * vars, esym = vars->esym_ptr; /* Copy the symbol's name into the string table. */ - sprintf (vars->string_ptr, "%s%s", prefix, symbol_name); + int len = sprintf (vars->string_ptr, "%s%s", prefix, symbol_name); if (section == NULL) section = bfd_und_section_ptr; @@ -612,7 +612,7 @@ pe_ILF_make_a_symbol (pe_ILF_vars * vars, vars->table_ptr ++; vars->native_ptr ++; vars->esym_ptr ++; - vars->string_ptr += strlen (symbol_name) + strlen (prefix) + 1; + vars->string_ptr += len + 1; BFD_ASSERT (vars->string_ptr < vars->end_string_ptr); } -- Alan Modra Australia Development Lab, IBM