From 9faf23290cb869aa72a4aa3efed047fd4ac20d6c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 7 Dec 2015 08:11:44 -0600 Subject: [PATCH] netutils/telnetd: Remove unused parameter from telnetd_driver --- ChangeLog.txt | 6 ++++-- netutils/telnetd/telnetd.h | 4 +--- netutils/telnetd/telnetd_daemon.c | 2 +- netutils/telnetd/telnetd_driver.c | 6 ++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 3db8af305..0305b6b28 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1435,7 +1435,7 @@ * apps/examples/uavcan: libuavcan example from Paul Alexander Patience (2015-10-01). -7.13 2015-xx-xx Gregory Nutt +7.13 2015-12-05 Gregory Nutt * apps/examples/fstest: Add a generic file system test. This is essentially the same as examples/smart, but has all of the SmartFS @@ -1467,7 +1467,7 @@ * apps/nshlib: If CONFIG_NETDEV_STATISTICS=y, then print the network driver statistics in the ifconfig (15-11-26). * apps/nshlib: The 'ifconfig' command now uses /proc/net/ to view - and network device configuration/status and /proc/net/stat to show + network device configuration and status and /proc/net/stat to show network statistics. A consequence of this is that you cannot view this network information if the procfs is not enabled and mounted at /proc (2015-11-27). @@ -1485,3 +1485,5 @@ task status information. A consequence of this is that you cannot use the 'ps' command if the procfs is not enabled and mounted at /proc (2015-11-28). + +7.14 2015-xx-xx Gregory Nutt diff --git a/netutils/telnetd/telnetd.h b/netutils/telnetd/telnetd.h index 0d0d69cac..e26af9f2d 100644 --- a/netutils/telnetd/telnetd.h +++ b/netutils/telnetd/telnetd.h @@ -99,8 +99,6 @@ extern struct telnetd_common_s g_telnetdcommon; * * Parameters: * sd - The socket descriptor that represents the new telnet connection. - * daemon - A pointer to the structure representing the overall state of - * this instance of the telnet daemon. * * Return: * An allocated string represent the full path to the created driver. The @@ -109,7 +107,7 @@ extern struct telnetd_common_s g_telnetdcommon; * ****************************************************************************/ -FAR char *telnetd_driver(int sd, FAR struct telnetd_s *daemon); +FAR char *telnetd_driver(int sd); #endif /* __APPS_NETUTILS_TELNETD_TELNETD_H */ diff --git a/netutils/telnetd/telnetd_daemon.c b/netutils/telnetd/telnetd_daemon.c index 41ae7e195..1bca3cd62 100644 --- a/netutils/telnetd/telnetd_daemon.c +++ b/netutils/telnetd/telnetd_daemon.c @@ -252,7 +252,7 @@ static int telnetd_daemon(int argc, char *argv[]) /* Create a character device to "wrap" the accepted socket descriptor */ nllvdbg("Creating the telnet driver\n"); - devpath = telnetd_driver(acceptsd, daemon); + devpath = telnetd_driver(acceptsd); if (devpath < 0) { nlldbg("ERROR: telnetd_driver failed\n"); diff --git a/netutils/telnetd/telnetd_driver.c b/netutils/telnetd/telnetd_driver.c index 53d4673ae..f3383eecb 100644 --- a/netutils/telnetd/telnetd_driver.c +++ b/netutils/telnetd/telnetd_driver.c @@ -738,8 +738,6 @@ static int telnetd_poll(FAR struct file *filep, FAR struct pollfd *fds, * * Parameters: * sd - The socket descriptor that represents the new telnet connection. - * daemon - A pointer to the structure representing the overall state of - * this instance of the telnet daemon. * * Return: * An allocated string represent the full path to the created driver. The @@ -748,7 +746,7 @@ static int telnetd_poll(FAR struct file *filep, FAR struct pollfd *fds, * ****************************************************************************/ -FAR char *telnetd_driver(int sd, FAR struct telnetd_s *daemon) +FAR char *telnetd_driver(int sd) { FAR struct telnetd_dev_s *priv; FAR struct socket *psock; @@ -775,7 +773,7 @@ FAR char *telnetd_driver(int sd, FAR struct telnetd_s *daemon) /* Clone the internal socket structure. We do this so that it will be * independent of threads and of socket descriptors (the original socket - * instance resided in the daemon's socket array). + * instance resided in the daemon's task group`). */ psock = sockfd_socket(sd);