From nobody Thu Jul 24 21:04:50 2025 X-Original-To: dev-commits-src-main@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 4bp3RR1xHyz639Yq; Thu, 24 Jul 2025 21:04:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bp3RQ5zntz3vGB; Thu, 24 Jul 2025 21:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753391090; 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; bh=ILOiBkfN+LIkCUCBcQjsZbareqnVAHfJ1Z1VdcjLcdE=; b=VY0YPqkdTRpLqtDOdg20AgGcOBsVGk6Z8NijAvJfx7ER0HC/zQJHaXZUQIh5e6Qy9OUPXX LcGIPA7wUVHQnWmFVlcAg5ojUnw713qIKJLaKuZ6OPHEKeo1uBto/0GAjX8ek5sriEJdr9 fJ7iHtYQ72e3BISJIKFdWWlBo6oQqyYYv0YyGFv6n+aaG6tVJWbaVyglccXr7vE8aVJt3o pRNH1OemFaIlG59Tfhq1HMkwVC89Jyg6v3GF1pLLITfVxvMgXOIfdlHRuhpHoXVE5Zeo28 5leDSHJ7kSnsgOs3zR/UuP5e3n1u2sw3CtXQp3BDZvvzB5TkVmx2VojE9JIVlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753391090; 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; bh=ILOiBkfN+LIkCUCBcQjsZbareqnVAHfJ1Z1VdcjLcdE=; b=F4VtDZSb83mbrt8q/C2j9ctSYInmfgyTjEb0rQ7cWI7I+Jnzw4O2jIa2VB8jR0Il9+1yf3 cpiGCWyF22ZnpLRVRL+sUIhQRhonnIRnSlRapGkwckXf7x3vlnF8YMuwt2vuGlfZgKnuxo nObM2dGmXyk71xSekT7Bfoqf3T+jElRQwk3zrShz6XkPVwnxuKT4wsuv3sjyV4oujxe8zC 8mWXk3uWuTJJl7f0Z67e/ix/buXiuoT9C1M9zmNsoQKiUITUtgy9wK/kfvE6oh7N6lSURt 8jhK8kO9mwFlrVVB8v8Ah4xkM91xOgm+FWtNV7vfaJPgO/B8EB5tZPM4FsJXBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753391090; a=rsa-sha256; cv=none; b=p9mJykj/l1KMLRJWcEDjm3YlewxAVu84YcMaFsEdUPZNs+dGF6Df+m2sBJLlv+526ef02T pwl5V5PwRBuQQXpP9zC4C/1L2swbHgRSgshVEIUi7HLA1c37B+noTw5HGxPCmYYn9QJ+Gn xchWwJ7KXTh1Zjj6oM5YNp29eG/U0wU3KqfRlqP1PSSn55FWFw3p1fJ888XR2lZJJ1IDAs QZDn33HCh+ciMfXgmO9haF+/2AF2cjvKDAXDWQpBcxeGVAjD9XyU70SlR1UBZ4ZAcdBxin UJX4+0rJW4M4rHU+3XW0nr33bW6b5BkHjaW7062AqWRp4KSjLsKvc27SYBe3XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bp3RQ4L48zbH; Thu, 24 Jul 2025 21:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56OL4oFp006602; Thu, 24 Jul 2025 21:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56OL4oLA006599; Thu, 24 Jul 2025 21:04:50 GMT (envelope-from git) Date: Thu, 24 Jul 2025 21:04:50 GMT Message-Id: <202507242104.56OL4oLA006599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e8d6b58ef5a4 - main - devinfo: Fix some libxo errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8d6b58ef5a4afe0d155b6967c92d55f3bbd53fe Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d6b58ef5a4afe0d155b6967c92d55f3bbd53fe commit e8d6b58ef5a4afe0d155b6967c92d55f3bbd53fe Author: Warner Losh AuthorDate: 2025-07-24 21:02:24 +0000 Commit: Warner Losh CommitDate: 2025-07-24 21:04:06 +0000 devinfo: Fix some libxo errors Add missing names of fields, as exposed by --libxo:JPW Fixes: c759aca606cee Noticed by: phil Sponsored by: Netflix --- usr.sbin/devinfo/devinfo.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index 629a04ba6687..4163151ec840 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -100,7 +100,7 @@ print_kvlist(char *s) while ((kv = strsep(©, " ")) != NULL) { char* k = strsep(&kv, "="); - xo_emit("{ea:%s/%s} {d:%s}={d:%s}", k, kv, k, kv); + xo_emit("{ea:%s/%s} {d:key/%s}={d:value/%s}", k, kv, k, kv); } free(copy); } @@ -200,7 +200,7 @@ print_device_rman_resources(struct devinfo_rman *rman, void *arg) /* there are, print header */ safe_desc = xml_safe_string(rman->dm_desc); print_indent(indent); - xo_emit("{d:%s}:\n", rman->dm_desc); + xo_emit("<{:description/%s}>\n", rman->dm_desc); xo_open_list(safe_desc); /* print resources */ @@ -220,8 +220,7 @@ print_device_props(struct devinfo_dev *dev) { if (vflag) { if (*dev->dd_desc) { - xo_emit(" <{d:%s}>", dev->dd_desc); - xo_emit("{e:description/%s}", dev->dd_desc); + xo_emit("<{:description/%s}>", dev->dd_desc); } if (*dev->dd_pnpinfo) { xo_open_container("pnpinfo"); @@ -273,7 +272,7 @@ print_device(struct devinfo_dev *dev, void *arg) print_indent(indent); xo_open_container(devname); - xo_emit("{d:%s}", devname); + xo_emit("{d:devicename/%s}", devname); print_device_props(dev); xo_emit("\n"); @@ -367,7 +366,7 @@ print_rman(struct devinfo_rman *rman, void *arg __unused) { char* safe_desc = xml_safe_string(rman->dm_desc); - xo_emit("{d:%s}:\n", rman->dm_desc); + xo_emit("<{:description/%s}\n>", rman->dm_desc); xo_open_container(safe_desc); devinfo_foreach_rman_resource(rman, print_rman_resource, 0); @@ -385,7 +384,7 @@ print_device_path_entry(struct devinfo_dev *dev) xo_open_container(devname); open_tag_count++; - xo_emit("{d:%s }", devname); + xo_emit("{:devicename/%s} ", devname); print_device_props(dev); if (vflag) xo_emit("\n");