svn commit: r278622 - in head/usr.sbin: ctld iscsid

Edward Tomasz Napierala trasz at FreeBSD.org
Thu Feb 12 11:57:33 UTC 2015


Author: trasz
Date: Thu Feb 12 11:57:31 2015
New Revision: 278622
URL: https://svnweb.freebsd.org/changeset/base/278622

Log:
  Remove unused code.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.sbin/ctld/ctld.h
  head/usr.sbin/ctld/keys.c
  head/usr.sbin/iscsid/iscsid.h
  head/usr.sbin/iscsid/keys.c

Modified: head/usr.sbin/ctld/ctld.h
==============================================================================
--- head/usr.sbin/ctld/ctld.h	Thu Feb 12 11:27:54 2015	(r278621)
+++ head/usr.sbin/ctld/ctld.h	Thu Feb 12 11:57:31 2015	(r278622)
@@ -416,7 +416,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: head/usr.sbin/ctld/keys.c
==============================================================================
--- head/usr.sbin/ctld/keys.c	Thu Feb 12 11:27:54 2015	(r278621)
+++ head/usr.sbin/ctld/keys.c	Thu Feb 12 11:57:31 2015	(r278622)
@@ -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: head/usr.sbin/iscsid/iscsid.h
==============================================================================
--- head/usr.sbin/iscsid/iscsid.h	Thu Feb 12 11:27:54 2015	(r278621)
+++ head/usr.sbin/iscsid/iscsid.h	Thu Feb 12 11:57:31 2015	(r278622)
@@ -116,7 +116,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: head/usr.sbin/iscsid/keys.c
==============================================================================
--- head/usr.sbin/iscsid/keys.c	Thu Feb 12 11:27:54 2015	(r278621)
+++ head/usr.sbin/iscsid/keys.c	Thu Feb 12 11:57:31 2015	(r278622)
@@ -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)
 {


More information about the svn-src-all mailing list