From owner-svn-src-stable@freebsd.org Sun Mar 19 10:26:01 2017 Return-Path: Delivered-To: svn-src-stable@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 B026ED11F4B; Sun, 19 Mar 2017 10:26:01 +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 626ECC40; Sun, 19 Mar 2017 10:26:01 +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 v2JAQ04N064606; Sun, 19 Mar 2017 10:26:00 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2JAQ02c064604; Sun, 19 Mar 2017 10:26:00 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201703191026.v2JAQ02c064604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 19 Mar 2017 10:26:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315535 - stable/11/usr.bin/iscsictl X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2017 10:26:01 -0000 Author: trasz Date: Sun Mar 19 10:26:00 2017 New Revision: 315535 URL: https://svnweb.freebsd.org/changeset/base/315535 Log: MFC r312539 (by mav@): Remove some unused code. Modified: stable/11/usr.bin/iscsictl/iscsictl.c stable/11/usr.bin/iscsictl/iscsictl.h Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/iscsictl/iscsictl.c ============================================================================== --- stable/11/usr.bin/iscsictl/iscsictl.c Sun Mar 19 09:36:43 2017 (r315534) +++ stable/11/usr.bin/iscsictl/iscsictl.c Sun Mar 19 10:26:00 2017 (r315535) @@ -700,17 +700,6 @@ usage(void) exit(1); } -char * -checked_strdup(const char *s) -{ - char *c; - - c = strdup(s); - if (c == NULL) - xo_err(1, "strdup"); - return (c); -} - int main(int argc, char **argv) { Modified: stable/11/usr.bin/iscsictl/iscsictl.h ============================================================================== --- stable/11/usr.bin/iscsictl/iscsictl.h Sun Mar 19 09:36:43 2017 (r315534) +++ stable/11/usr.bin/iscsictl/iscsictl.h Sun Mar 19 10:26:00 2017 (r315535) @@ -40,7 +40,6 @@ #define DEFAULT_IQN "iqn.1994-09.org.freebsd:" #define MAX_NAME_LEN 223 -#define MAX_DATA_SEGMENT_LENGTH 65536 #define AUTH_METHOD_UNSPECIFIED 0 #define AUTH_METHOD_NONE 1 @@ -88,23 +87,6 @@ struct conf { TAILQ_HEAD(, target) conf_targets; }; -#define CONN_SESSION_TYPE_NONE 0 -#define CONN_SESSION_TYPE_DISCOVERY 1 -#define CONN_SESSION_TYPE_NORMAL 2 - -struct connection { - struct target *conn_target; - int conn_socket; - int conn_session_type; - uint32_t conn_cmdsn; - uint32_t conn_statsn; - size_t conn_max_data_segment_length; - size_t conn_max_burst_length; - size_t conn_max_outstanding_r2t; - int conn_header_digest; - int conn_data_digest; -}; - struct conf *conf_new(void); struct conf *conf_new_from_file(const char *path); void conf_delete(struct conf *conf); @@ -116,7 +98,6 @@ void target_delete(struct target *ic); void print_periphs(int session_id); -char *checked_strdup(const char *); bool valid_iscsi_name(const char *name); int parse_enable(const char *enable);