From nobody Sun Jan 4 01:50:32 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dkL3s02DJz6MD8Z for ; Sun, 04 Jan 2026 01:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkL3r3qrpz3TBQ for ; Sun, 04 Jan 2026 01:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrdTbBM+KjNGK35G/OjMH4Jr8u75FDttTR3hI4VkIWg=; b=k1jQqJIlK9YascB8AVcuMMv8r4JR4GC2tsM8mwJo1Tclm/78tw6KHOCWRz8Ec5EouRCVfI SlLJM7xj5P88ljaMy0qCM0pYyntmlz9lvesOVbsmTvsegHShIUz93yLnoREFDdrkfOYjwz 0N+S9ezpnTGAOrnNRQFaYsMK7I/qpAg4ehzJSAM49MC+i7flPahiBDc9M0fB/MWQcOYlVF YubV+QqFaVfu1m7b3FcRx0ToHe9RWb8EnPGkJ7Jx+c5bbKXOefLMVH7FyL5DygQhpV+ugV 84I1Yv5gwDRHi064RzlgDdYgOiSM2fCF2+0DMDmcFs9Hi7S2Oo+hliWAVXm+Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767491432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrdTbBM+KjNGK35G/OjMH4Jr8u75FDttTR3hI4VkIWg=; b=MYTyuovni+BhQMToD4WPixPSKK24E7wLVOCovx96RvmDChTtBfrXe3LxZcVnKbt1lwOqiH 3B3VoaaY+4q5n2dInZxGf2WSIiSUa/FoH/o0eKyOglyGuYaB+ccjZxDuGiSFgstTLvS4pS bD11vOek8jK/OjBcjLEyd/5kUUuT7RSKvNm47hQgx4m66iWBlflPJ3A/ni6CH7yaRBHTE/ 8RWigQPS5MNQhgSVZVCWlFkYGjZX2FmYTiZyW/oD0lphu4POrZRp1GVfPBo19xq6IC76gM h/NVYC+0x63uX7QAZzAoKumABPPDzDy5K9mD2OtCvW+8xEzdIdvmBP5JrnwBzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767491432; a=rsa-sha256; cv=none; b=l6L/8ALnn/sdgOWsp9UCPCihHM6YiL9FffMFYpQCWmj3/H10aSsMFd5hgb0ENmG4QDHo/F DwmjoW6APMUtZ4U+tvtl9KnRp/2NHvk3nNGh6ceBIGGF+ewpugd3sDsWHt52Lt1lnuO3lu MYCBb9JbkJNpQ9BNvqDtr5faug8e9D4RaBqXubRs8786S2baQ0+FDw+YpsMEGUrmWr0q5h xjbIX8n7yH/kUgHteKQHDEkkMEaAm5do+Qt/79qaKHJViPy0oQaNWVctSC8fbJot+V+xHz eQCupg3zCuOdZxN/PPEIbtkgp6H6barpCQWpvc2l+EmMoM7KPsadZvyULPx+Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkL3r35Jtz1RvN for ; Sun, 04 Jan 2026 01:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed9d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 01:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alex Richardson From: Dimitry Andric Subject: git: b94022db9aed - stable/13 - ocs_fc: Use __printflike() instead of format(printf) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b94022db9aed8e01675baafde096e09c63bf6cf6 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 01:50:32 +0000 Message-Id: <6959c768.3ed9d.74a037a5@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b94022db9aed8e01675baafde096e09c63bf6cf6 commit b94022db9aed8e01675baafde096e09c63bf6cf6 Author: Alex Richardson AuthorDate: 2025-09-16 04:58:36 +0000 Commit: Dimitry Andric CommitDate: 2026-01-04 01:46:39 +0000 ocs_fc: Use __printflike() instead of format(printf) The __printflike macro sets the format to freebsd_kprintf which recent clang understands and warns about. Fixes the following error: `passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat]` MFC after: 1 week (cherry picked from commit 3c0ea1b629764c49611e3e3adfa0c44f9afa3558) --- sys/dev/ocs_fc/ocs_ddump.h | 3 +-- sys/dev/ocs_fc/ocs_mgmt.h | 3 +-- sys/dev/ocs_fc/ocs_os.h | 2 +- sys/dev/ocs_fc/ocs_utils.h | 12 ++++-------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_ddump.h b/sys/dev/ocs_fc/ocs_ddump.h index b7d7eefad813..3cffff6d9670 100644 --- a/sys/dev/ocs_fc/ocs_ddump.h +++ b/sys/dev/ocs_fc/ocs_ddump.h @@ -46,8 +46,7 @@ extern void ocs_ddump_startfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_endfile(ocs_textbuf_t *textbuf); extern void ocs_ddump_section(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); extern void ocs_ddump_endsection(ocs_textbuf_t *textbuf, const char *name, uint32_t instance); -__attribute__((format(printf,3,4))) -extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...); +extern void ocs_ddump_value(ocs_textbuf_t *textbuf, const char *name, const char *fmt, ...) __printflike(3, 4); extern void ocs_ddump_buffer(ocs_textbuf_t *textbuf, const char *name, uint32_t instance, void *buffer, uint32_t size); extern int32_t ocs_save_ddump(ocs_t *ocs, uint32_t flags, uint32_t qentries); extern int32_t ocs_get_saved_ddump(ocs_t *ocs, ocs_textbuf_t *textbuf); diff --git a/sys/dev/ocs_fc/ocs_mgmt.h b/sys/dev/ocs_fc/ocs_mgmt.h index 7b59a3916ca8..9781aec18462 100644 --- a/sys/dev/ocs_fc/ocs_mgmt.h +++ b/sys/dev/ocs_fc/ocs_mgmt.h @@ -95,8 +95,7 @@ extern void ocs_mgmt_end_section(ocs_textbuf_t *textbuf, const char *name, int i extern void ocs_mgmt_end_unnumbered_section(ocs_textbuf_t *textbuf, const char *name); extern void ocs_mgmt_emit_property_name(ocs_textbuf_t *textbuf, int access, const char *name); extern void ocs_mgmt_emit_string(ocs_textbuf_t *textbuf, int access, const char *name, const char *value); -__attribute__((format(printf,4,5))) -extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...); +extern void ocs_mgmt_emit_int(ocs_textbuf_t *textbuf, int access, const char *name, const char *fmt, ...) __printflike(4, 5); extern void ocs_mgmt_emit_boolean(ocs_textbuf_t *textbuf, int access, const char *name, const int value); extern int parse_wwn(char *wwn_in, uint64_t *wwn_out); diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 9e3beff35548..e0024a198cb7 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -711,7 +711,7 @@ typedef struct { * @return returns 0 for success, a negative error code value for failure. */ -extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __attribute__((format(printf, 3, 4))); +extern int ocs_sem_init(ocs_sem_t *sem, int val, const char *name, ...) __printflike(3, 4); /** * @brief execute a P (decrement) operation diff --git a/sys/dev/ocs_fc/ocs_utils.h b/sys/dev/ocs_fc/ocs_utils.h index e3a952e0cf26..7c9c9ae85b74 100644 --- a/sys/dev/ocs_fc/ocs_utils.h +++ b/sys/dev/ocs_fc/ocs_utils.h @@ -103,10 +103,8 @@ extern int32_t ocs_textbuf_init(ocs_t *ocs, ocs_textbuf_t *textbuf, void *buffer extern void ocs_textbuf_free(ocs_t *ocs, ocs_textbuf_t *textbuf); extern void ocs_textbuf_putc(ocs_textbuf_t *textbuf, uint8_t c); extern void ocs_textbuf_puts(ocs_textbuf_t *textbuf, char *s); -__attribute__((format(printf,2,3))) -extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap); +extern void ocs_textbuf_printf(ocs_textbuf_t *textbuf, const char *fmt, ...) __printflike(2, 3); +extern void ocs_textbuf_vprintf(ocs_textbuf_t *textbuf, const char *fmt, va_list ap) __printflike(2, 0); extern void ocs_textbuf_buffer(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern void ocs_textbuf_copy(ocs_textbuf_t *textbuf, uint8_t *buffer, uint32_t buffer_length); extern int32_t ocs_textbuf_remaining(ocs_textbuf_t *textbuf); @@ -325,10 +323,8 @@ typedef struct ocs_ramlog_s ocs_ramlog_t; extern ocs_ramlog_t *ocs_ramlog_init(ocs_t *ocs, uint32_t buffer_len, uint32_t buffer_count); extern void ocs_ramlog_free(ocs_t *ocs, ocs_ramlog_t *ramlog); extern void ocs_ramlog_clear(ocs_t *ocs, ocs_ramlog_t *ramlog, int clear_start_of_day, int clear_recent); -__attribute__((format(printf,2,3))) -extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...); -__attribute__((format(printf,2,0))) -extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap); +extern int32_t ocs_ramlog_printf(void *os, const char *fmt, ...) __printflike(2, 3); +extern int32_t ocs_ramlog_vprintf(ocs_ramlog_t *ramlog, const char *fmt, va_list ap) __printflike(2, 0); extern int32_t ocs_ddump_ramlog(ocs_textbuf_t *textbuf, ocs_ramlog_t *ramlog); #endif