From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DCB0CC9D7 for ; Mon, 10 Jul 2023 10:53:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BE6BD3C807 for ; Mon, 10 Jul 2023 10:53:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 10 Jul 2023 10:53:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D90B2424FC for ; Mon, 10 Jul 2023 10:53:15 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 10 Jul 2023 10:53:02 +0200 Message-Id: <20230710085302.27606-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230710085302.27606-1-f.ebner@proxmox.com> References: <20230710085302.27606-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.045 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 qemu-server 4/4] qmeventd: VMID from PID: avoid goto X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jul 2023 08:53:16 -0000 If strtol() returns an errno, make sure not to print the error message twice after the refactoring. Signed-off-by: Fiona Ebner --- New in v2. qmeventd/qmeventd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c index 76a894cb..002b2ac4 100644 --- a/qmeventd/qmeventd.c +++ b/qmeventd/qmeventd.c @@ -134,20 +134,18 @@ get_vmid_from_pid(pid_t pid) continue; } if (errno != 0) { - fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno)); vmid = 0; } - goto ret; + break; } if (errno) { fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno)); - } else { + } else if (!vmid) { fprintf(stderr, "error parsing vmid for %d: no matching qemu.slice cgroup entry\n", pid); } -ret: free(buf); fclose(fp); return vmid; -- 2.39.2