From owner-svn-src-all@freebsd.org Sun Jan 22 20:11:26 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AEC9CBCCDB; Sun, 22 Jan 2017 20:11:26 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15AFA1CFC; Sun, 22 Jan 2017 20:11:26 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0MKBPHk004111; Sun, 22 Jan 2017 20:11:25 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0MKBPHE004110; Sun, 22 Jan 2017 20:11:25 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201701222011.v0MKBPHE004110@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 22 Jan 2017 20:11:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r312652 - head/usr.bin/iscsictl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2017 20:11:26 -0000 Author: trasz Date: Sun Jan 22 20:11:24 2017 New Revision: 312652 URL: https://svnweb.freebsd.org/changeset/base/312652 Log: Move values displayed by "iscsictl -v" one character to the right, to line up output from "iscsictl -v" with "ctladm islist -v". MFC after: 2 weeks Modified: head/usr.bin/iscsictl/iscsictl.c Modified: head/usr.bin/iscsictl/iscsictl.c ============================================================================== --- head/usr.bin/iscsictl/iscsictl.c Sun Jan 22 20:06:15 2017 (r312651) +++ head/usr.bin/iscsictl/iscsictl.c Sun Jan 22 20:11:24 2017 (r312652) @@ -514,74 +514,74 @@ kernel_list(int iscsi_fd, const struct t * Display-only modifier as this information * is also present within the 'session' container */ - xo_emit("{L:/%-25s}{V:sessionId/%u}\n", + xo_emit("{L:/%-26s}{V:sessionId/%u}\n", "Session ID:", state->iss_id); xo_open_container("initiator"); - xo_emit("{L:/%-25s}{V:name/%s}\n", + xo_emit("{L:/%-26s}{V:name/%s}\n", "Initiator name:", conf->isc_initiator); - xo_emit("{L:/%-25s}{V:portal/%s}\n", + xo_emit("{L:/%-26s}{V:portal/%s}\n", "Initiator portal:", conf->isc_initiator_addr); - xo_emit("{L:/%-25s}{V:alias/%s}\n", + xo_emit("{L:/%-26s}{V:alias/%s}\n", "Initiator alias:", conf->isc_initiator_alias); xo_close_container("initiator"); xo_open_container("target"); - xo_emit("{L:/%-25s}{V:name/%s}\n", + xo_emit("{L:/%-26s}{V:name/%s}\n", "Target name:", conf->isc_target); - xo_emit("{L:/%-25s}{V:portal/%s}\n", + xo_emit("{L:/%-26s}{V:portal/%s}\n", "Target portal:", conf->isc_target_addr); - xo_emit("{L:/%-25s}{V:alias/%s}\n", + xo_emit("{L:/%-26s}{V:alias/%s}\n", "Target alias:", state->iss_target_alias); xo_close_container("target"); xo_open_container("auth"); - xo_emit("{L:/%-25s}{V:user/%s}\n", + xo_emit("{L:/%-26s}{V:user/%s}\n", "User:", conf->isc_user); - xo_emit("{L:/%-25s}{V:secret/%s}\n", + xo_emit("{L:/%-26s}{V:secret/%s}\n", "Secret:", conf->isc_secret); - xo_emit("{L:/%-25s}{V:mutualUser/%s}\n", + xo_emit("{L:/%-26s}{V:mutualUser/%s}\n", "Mutual user:", conf->isc_mutual_user); - xo_emit("{L:/%-25s}{V:mutualSecret/%s}\n", + xo_emit("{L:/%-26s}{V:mutualSecret/%s}\n", "Mutual secret:", conf->isc_mutual_secret); xo_close_container("auth"); - xo_emit("{L:/%-25s}{V:type/%s}\n", + xo_emit("{L:/%-26s}{V:type/%s}\n", "Session type:", conf->isc_discovery ? "Discovery" : "Normal"); - xo_emit("{L:/%-25s}{V:enable/%s}\n", + xo_emit("{L:/%-26s}{V:enable/%s}\n", "Enable:", conf->isc_enable ? "Yes" : "No"); - xo_emit("{L:/%-25s}{V:state/%s}\n", + xo_emit("{L:/%-26s}{V:state/%s}\n", "Session state:", state->iss_connected ? "Connected" : "Disconnected"); - xo_emit("{L:/%-25s}{V:failureReason/%s}\n", + xo_emit("{L:/%-26s}{V:failureReason/%s}\n", "Failure reason:", state->iss_reason); - xo_emit("{L:/%-25s}{V:headerDigest/%s}\n", + xo_emit("{L:/%-26s}{V:headerDigest/%s}\n", "Header digest:", state->iss_header_digest == ISCSI_DIGEST_CRC32C ? "CRC32C" : "None"); - xo_emit("{L:/%-25s}{V:dataDigest/%s}\n", + xo_emit("{L:/%-26s}{V:dataDigest/%s}\n", "Data digest:", state->iss_data_digest == ISCSI_DIGEST_CRC32C ? "CRC32C" : "None"); - xo_emit("{L:/%-25s}{V:recvDataSegmentLen/%d}\n", + xo_emit("{L:/%-26s}{V:recvDataSegmentLen/%d}\n", "MaxRecvDataSegmentLength:", state->iss_max_recv_data_segment_length); - xo_emit("{L:/%-25s}{V:sendDataSegmentLen/%d}\n", + xo_emit("{L:/%-26s}{V:sendDataSegmentLen/%d}\n", "MaxSendDataSegmentLength:", state->iss_max_send_data_segment_length); - xo_emit("{L:/%-25s}{V:maxBurstLen/%d}\n", + xo_emit("{L:/%-26s}{V:maxBurstLen/%d}\n", "MaxBurstLen:", state->iss_max_burst_length); - xo_emit("{L:/%-25s}{V:firstBurstLen/%d}\n", + xo_emit("{L:/%-26s}{V:firstBurstLen/%d}\n", "FirstBurstLen:", state->iss_first_burst_length); - xo_emit("{L:/%-25s}{V:immediateData/%s}\n", + xo_emit("{L:/%-26s}{V:immediateData/%s}\n", "ImmediateData:", state->iss_immediate_data ? "Yes" : "No"); - xo_emit("{L:/%-25s}{V:iSER/%s}\n", + xo_emit("{L:/%-26s}{V:iSER/%s}\n", "iSER (RDMA):", conf->isc_iser ? "Yes" : "No"); - xo_emit("{L:/%-25s}{V:offloadDriver/%s}\n", + xo_emit("{L:/%-26s}{V:offloadDriver/%s}\n", "Offload driver:", state->iss_offload); - xo_emit("{L:/%-25s}", + xo_emit("{L:/%-26s}", "Device nodes:"); print_periphs(state->iss_id); xo_emit("\n\n");