From nobody Tue Jan 24 22:11:32 2023 X-Original-To: dev-commits-src-all@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 4P1h5J5nPMz3bfW6; Tue, 24 Jan 2023 22:11:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h5J3knqz4NX6; Tue, 24 Jan 2023 22:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598292; 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=hWURTJOlYbkjhhnAClf3LOsJEJCTOVyLnaUMWybdm8g=; b=FdqeRscQ8qvUFzrHDBxpJhP9HtIqotH/fUWnebE/Dk1kX08rs11X8civIVkRm3C9mz55bV kmI8HFzL2LlkfSc07GuxTzeYq98RwRyiEwUIovcxhuGveYjn2mQhg5h0I0qOAsx9+Xeu17 twTO9vv3mksVH4vIJh3KaXy1nvm/7NWuq+QlpjQEjnEBam3kG+OdOHz0KT/JaTZQ9+SezJ /2RynYi6qUpPTHrPZJni0rE2Foql0UkkpxbbArlw7HQzmZ+dVGy9fSatGj3hh7NRSqt8nK P95xQ03Sk26abl01V3gVH7L1rXBNdUnHY0rEzmf/pAA1xH6qNjDhyG8r/WtlcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598292; 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=hWURTJOlYbkjhhnAClf3LOsJEJCTOVyLnaUMWybdm8g=; b=emNrVP/YN9T0R9YtKn8AwRzjS17MbjW/AIzch8BgPVKzvHg/Ki0B6eCKw86EZkqnCBAJqT nwcTc90NK79Xq/CBSmz0tmwiiMVmohsf3JbXlaPcuWXb3M6IIBKwoUbuz2BdgCpjVwbmsI 2KVzFiJ/mH2WbKZYpLOSB77LlUj34PrptJmwfZcdlG9b4eyndQ6fA3UUyquRQd+3P/S562 nlh6m1LudQMIO8lwzPfj3QELQMiw9DA9BSBlzmLkF+CKYzl0UoPx6H6BHtvniTU03nBTlE Fj808/RidLySAVwJaPHk1+4Towl1PbJrDCyvDWGP/bQrh+drwjhRfsGkVSc3tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598292; a=rsa-sha256; cv=none; b=AOvtm1OPR1M2bg40AMRWuHFzJzYDmnQ23WUgX6GaH75dNlvodgiLqUPjNg/dxaN4z90F7w ljPcvpkdJgt8sYrDVGNHND0slIfbS4Alc3xcq6ftx86E2I6bd59Rw11rtaIoELRyCM1m7b ofgqOttMI7XokVcMNRgOytNDmOQfsdmmZ6JlEPW73X4ew335yv5uo4ApDjosUKkWIyTiey IJbJWbuW6LIZ5rOmQGxro+KCOnCwSAOYzpt9M23+shuYx8bTzhDIGdC4KrIZEllCyst4dy NfeiQ2Ty9t27l8Y1SJWGEGME0iGYtMuBK23PUQ8GzIxxkN/36hlt1bzZzgiwHg== 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 4P1h5J2r1kzQXF; Tue, 24 Jan 2023 22:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMBWQ5084860; Tue, 24 Jan 2023 22:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBWr4084859; Tue, 24 Jan 2023 22:11:32 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:32 GMT Message-Id: <202301242211.30OMBWr4084859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b23f20eb0fec - stable/13 - kboot: Do a style(9) pass on kbootfdt.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b23f20eb0fec72af500d8ad14cd0ae8ae3b15300 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b23f20eb0fec72af500d8ad14cd0ae8ae3b15300 commit b23f20eb0fec72af500d8ad14cd0ae8ae3b15300 Author: Warner Losh AuthorDate: 2022-07-28 04:07:52 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:28 +0000 kboot: Do a style(9) pass on kbootfdt.c Mostly just properly indent. Sponsored by: Netflix (cherry picked from commit 065cbc77076ec8d38385406deefa8331bc2432f5) --- stand/kboot/kbootfdt.c | 68 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/stand/kboot/kbootfdt.c b/stand/kboot/kbootfdt.c index 14bc94326fe6..5e0ef9ea3068 100644 --- a/stand/kboot/kbootfdt.c +++ b/stand/kboot/kbootfdt.c @@ -53,44 +53,44 @@ add_node_to_fdt(void *buffer, const char *path, int fdt_offset) fd = host_open(path, O_RDONLY, 0); while (1) { - dentsize = host_getdents(fd, dents, sizeof(dents)); - if (dentsize <= 0) - break; - for (dent = (struct host_dent *)dents; - (char *)dent < dents + dentsize; - dent = (struct host_dent *)((void *)dent + dent->d_reclen)) { - sprintf(subpath, "%s/%s", path, dent->d_name); - if (strcmp(dent->d_name, ".") == 0 || - strcmp(dent->d_name, "..") == 0) - continue; - d_type = *((char *)(dent) + dent->d_reclen - 1); - if (d_type == 4 /* DT_DIR */) { - child_offset = fdt_add_subnode(buffer, fdt_offset, - dent->d_name); - if (child_offset < 0) { - printf("Error %d adding node %s/%s, skipping\n", - child_offset, path, dent->d_name); + dentsize = host_getdents(fd, dents, sizeof(dents)); + if (dentsize <= 0) + break; + for (dent = (struct host_dent *)dents; + (char *)dent < dents + dentsize; + dent = (struct host_dent *)((void *)dent + dent->d_reclen)) { + sprintf(subpath, "%s/%s", path, dent->d_name); + if (strcmp(dent->d_name, ".") == 0 || + strcmp(dent->d_name, "..") == 0) continue; - } + d_type = *((char *)(dent) + dent->d_reclen - 1); + if (d_type == 4 /* DT_DIR */) { + child_offset = fdt_add_subnode(buffer, fdt_offset, + dent->d_name); + if (child_offset < 0) { + printf("Error %d adding node %s/%s, skipping\n", + child_offset, path, dent->d_name); + continue; + } - add_node_to_fdt(buffer, subpath, child_offset); - } else { - propbuf = malloc(1024); - proplen = 0; - pfd = host_open(subpath, O_RDONLY, 0); - if (pfd > 0) { - proplen = host_read(pfd, propbuf, 1024); - host_close(pfd); + add_node_to_fdt(buffer, subpath, child_offset); + } else { + propbuf = malloc(1024); + proplen = 0; + pfd = host_open(subpath, O_RDONLY, 0); + if (pfd > 0) { + proplen = host_read(pfd, propbuf, 1024); + host_close(pfd); + } + error = fdt_setprop(buffer, fdt_offset, dent->d_name, + propbuf, proplen); + free(propbuf); + if (error) + printf("Error %d adding property %s to " + "node %d\n", error, dent->d_name, + fdt_offset); } - error = fdt_setprop(buffer, fdt_offset, dent->d_name, - propbuf, proplen); - free(propbuf); - if (error) - printf("Error %d adding property %s to " - "node %d\n", error, dent->d_name, - fdt_offset); } - } } host_close(fd);