Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 19 Mar 2017 10:26:00 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
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
Message-ID:  <201703191026.v2JAQ02c064604@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703191026.v2JAQ02c064604>