svn commit: r288698 - in stable/10/usr.sbin: ctld iscsid

[Alexander Motin]

Author: mav
Date: Mon Oct  5 07:31:51 2015
New Revision: 288698
URL: https://svnweb.freebsd.org/changeset/base/288698

Log:
  MFC r278622 (by trasz): Remove unused code.

Modified:
  stable/10/usr.sbin/ctld/ctld.h
  stable/10/usr.sbin/ctld/keys.c
  stable/10/usr.sbin/iscsid/iscsid.h
  stable/10/usr.sbin/iscsid/keys.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/ctld.h
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.h	Mon Oct  5 07:29:26 2015	(r288697)
+++ stable/10/usr.sbin/ctld/ctld.h	Mon Oct  5 07:31:51 2015	(r288698)
@@ -410,7 +410,6 @@ void			keys_delete(struct keys *keys);
 void			keys_load(struct keys *keys, const struct pdu *pdu);
 void			keys_save(struct keys *keys, struct pdu *pdu);
 const char		*keys_find(struct keys *keys, const char *name);
-int			keys_find_int(struct keys *keys, const char *name);
 void			keys_add(struct keys *keys,
 			    const char *name, const char *value);
 void			keys_add_int(struct keys *keys,

Modified: stable/10/usr.sbin/ctld/keys.c
==============================================================================
--- stable/10/usr.sbin/ctld/keys.c	Mon Oct  5 07:29:26 2015	(r288697)
+++ stable/10/usr.sbin/ctld/keys.c	Mon Oct  5 07:31:51 2015	(r288698)
@@ -161,26 +161,6 @@ keys_find(struct keys *keys, const char 
 	return (NULL);
 }
 
-int
-keys_find_int(struct keys *keys, const char *name)
-{
-	const char *str;
-	char *endptr;
-	int num;
-
-	str = keys_find(keys, name);
-	if (str == NULL)
-		return (-1);
-
-	num = strtoul(str, &endptr, 10);
-	if (*endptr != '\0') {
-		log_debugx("invalid numeric value \"%s\"", str);
-		return (-1);
-	}
-
-	return (num);
-}
-
 void
 keys_add(struct keys *keys, const char *name, const char *value)
 {

Modified: stable/10/usr.sbin/iscsid/iscsid.h
==============================================================================
--- stable/10/usr.sbin/iscsid/iscsid.h	Mon Oct  5 07:29:26 2015	(r288697)
+++ stable/10/usr.sbin/iscsid/iscsid.h	Mon Oct  5 07:31:51 2015	(r288698)
@@ -115,7 +115,6 @@ void			keys_delete(struct keys *key);
 void			keys_load(struct keys *keys, const struct pdu *pdu);
 void			keys_save(struct keys *keys, struct pdu *pdu);
 const char		*keys_find(struct keys *keys, const char *name);
-int			keys_find_int(struct keys *keys, const char *name);
 void			keys_add(struct keys *keys,
 			    const char *name, const char *value);
 void			keys_add_int(struct keys *keys,

Modified: stable/10/usr.sbin/iscsid/keys.c
==============================================================================
--- stable/10/usr.sbin/iscsid/keys.c	Mon Oct  5 07:29:26 2015	(r288697)
+++ stable/10/usr.sbin/iscsid/keys.c	Mon Oct  5 07:31:51 2015	(r288698)
@@ -162,26 +162,6 @@ keys_find(struct keys *keys, const char 
 	return (NULL);
 }
 
-int
-keys_find_int(struct keys *keys, const char *name)
-{
-	const char *str;
-	char *endptr;
-	int num;
-
-	str = keys_find(keys, name);
-	if (str == NULL)
-		return (-1);
-
-	num = strtoul(str, &endptr, 10);
-	if (*endptr != '\0') {
-		log_debugx("invalid numeric value \"%s\"", str);
-		return (-1);
-	}
-
-	return (num);
-}
-
 void
 keys_add(struct keys *keys, const char *name, const char *value)
 {