From nobody Sun Dec 14 08:05:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1751634499; cv=none; d=zohomail.com; s=zohoarc; b=ne8s4HhhJbBsQ7QS7RE998zep9Mr87TUHYJDC2YYffs+DPKGNeJ0vLQglfiClfZFOIgRGrwlJTM+RX7qPs+agugzgHYRv3BTgUO0ijdh1Uut+2rg1/HvcH0rcxu+UKNBGH17kKc+4yDkzvIwwLygl8xQnHJ2L5x8MF+IVYcrvX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751634499; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=fHpim8YckqW7VXnJnP6iIz7AuZXo5F+5wfe09soxEJs=; b=BDnEoOvCS8Pj/U5z85L+oy8VMdojTUYOTytwwPfZOXVGTatusTXtYl+ubKDcMsXBw5SOhmin63bURVCis82cGWA364tWqVUhAshi3noONvQv5eHnh8Q0HWu+hwg14/E1EW7rPVYMOQCSIoAwX6+hWe0IvXOBlCvUIT6APllIoPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1751634499438154.8439575868514; Fri, 4 Jul 2025 06:08:19 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6B9C91357; Fri, 4 Jul 2025 09:08:18 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A090111BE; Fri, 4 Jul 2025 09:06:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BD03C14D3; Fri, 4 Jul 2025 09:06:13 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B5700DE5 for ; Fri, 4 Jul 2025 09:06:12 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-79-5W5TdGzLMtq9pSvWduCLaA-1; Fri, 04 Jul 2025 09:06:11 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 74E6118001D6 for ; Fri, 4 Jul 2025 13:06:10 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.3.236]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C38AE18002B5 for ; Fri, 4 Jul 2025 13:06:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751634372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jFVKr5aQ/qRH2h+9yJhL6J3YAsCKwHRLA2HRg5L12TU=; b=d/Q2X0KiVjRpKaivBm1z6ZJSrnfhhZheEWWNUlyV+PfCXlqTh8MbZDYz2DNuXZsB1Zsjo9 99zAZckCGED02wsKzmcjYTF7JaZokoGfk6IORKOPBhO0EtuwERyu644gk0DcohXHY/wctC Mgmhun0F9ArL4nWitxZk/D1jVkZc6YE= X-MC-Unique: 5W5TdGzLMtq9pSvWduCLaA-1 X-Mimecast-MFC-AGG-ID: 5W5TdGzLMtq9pSvWduCLaA_1751634370 To: devel@lists.libvirt.org Subject: [PATCH 4/6] nss: Include filename in debug printings Date: Fri, 4 Jul 2025 15:05:33 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oAcZ-9Kvmku54hVkVyHio3rd-6CYK5iZTH7VV2fraRc_1751634370 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 74QVXUEIPNPKLFLFCB47NWRNIRR6BM77 X-Message-ID-Hash: 74QVXUEIPNPKLFLFCB47NWRNIRR6BM77 X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1751634502158116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Signed-off-by: Michal Privoznik --- tools/nss/libvirt_nss_log.c | 7 ++++++- tools/nss/libvirt_nss_log.h | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/nss/libvirt_nss_log.c b/tools/nss/libvirt_nss_log.c index 9a28a91800..04fc049376 100644 --- a/tools/nss/libvirt_nss_log.c +++ b/tools/nss/libvirt_nss_log.c @@ -46,6 +46,7 @@ nssLogPriorityToString(nssLogPriority prio) =20 void nssLog(nssLogPriority prio, + const char *filename, const char *func, int linenr, const char *fmt, ...) @@ -58,7 +59,11 @@ nssLog(nssLogPriority prio, if (!getenv(NSS_LOG_ENV_VAR)) return; =20 - fprintf(stderr, "%s %s:%d : ", nssLogPriorityToString(prio), func, lin= enr); + if ((filename =3D strrchr(filename, '/'))) + filename++; + + fprintf(stderr, "%s %s:%s():%d : ", + nssLogPriorityToString(prio), NULLSTR(filename), func, linenr); =20 va_start(ap, fmt); vfprintf(stderr, fmt, ap); diff --git a/tools/nss/libvirt_nss_log.h b/tools/nss/libvirt_nss_log.h index 25926fb6de..60696c7b08 100644 --- a/tools/nss/libvirt_nss_log.h +++ b/tools/nss/libvirt_nss_log.h @@ -26,15 +26,16 @@ typedef enum { } nssLogPriority; =20 #define DEBUG(...) \ - nssLog(NSS_DEBUG, __FUNCTION__, __LINE__, __VA_ARGS__) + nssLog(NSS_DEBUG, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) =20 #define ERROR(...) \ - nssLog(NSS_ERROR, __FUNCTION__, __LINE__, __VA_ARGS__) + nssLog(NSS_ERROR, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) =20 #define NSS_LOG_ENV_VAR "LIBVIRT_NSS_DEBUG" =20 void nssLog(nssLogPriority prio, + const char *filename, const char *func, int linenr, - const char *fmt, ...) __attribute__ ((format(printf, 4, 5))); + const char *fmt, ...) __attribute__ ((format(printf, 5, 6))); --=20 2.49.0