From 584266f8215d913ce0c226f63da51c77d1074f09 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Mon, 22 Feb 2016 12:38:10 +0200
Subject: Get rid of progman_iterate_comp

* src/inetd-bi.c (tcpmux): Use component_foreach to
handle help requests.
* src/progman.c (progman_iterate_comp): Removed.
* src/pies.h: Likewise.
---
 src/inetd-bi.c |  2 +-
 src/pies.h     |  6 ++----
 src/progman.c  | 14 --------------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/inetd-bi.c b/src/inetd-bi.c
index d0d3ea4..7ce4b39 100644
--- a/src/inetd-bi.c
+++ b/src/inetd-bi.c
@@ -334,7 +334,7 @@ tcpmux (int fd, struct component const *comp)
 
   if (!strcasecmp (service, "help"))
     {
-      progman_iterate_comp (tcpmux_help, &fd);
+      component_foreach (tcpmux_help, &fd);
       return;
     }
 
diff --git a/src/pies.h b/src/pies.h
index d4b5c6a..93f90b1 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -349,9 +349,6 @@ struct component *progman_lookup_tcpmux (const char *service,
 void progman_run_comp (struct component *comp, int fd,
 		       union pies_sockaddr_storage *sa, socklen_t salen);
 
-void progman_iterate_comp (int (*fun) (struct component *, void *),
-			   void *data);
-
 void fd_report (int fd, const char *msg);
 
 int check_acl (pies_acl_t acl, struct sockaddr *s, socklen_t salen,
@@ -572,7 +569,8 @@ extern char *init_fifo;
 
 #define INIT_CMD_CHANGECONS	12345
 
-struct sysvinit_request {
+struct sysvinit_request
+{
   int	magic;			/* Magic number                 */
   int	cmd;			/* What kind of request         */
   int	runlevel;		/* Runlevel to change to        */
diff --git a/src/progman.c b/src/progman.c
index 1a5bc90..f68fe91 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -46,20 +46,6 @@ progman_foreach (int (*filter) (struct prog *, void *data), void *data)
     }
   return rc;
 }
-
-/* FIXME: Rewrite this using progman_foreach? */
-void
-progman_iterate_comp (int (*fun) (struct component *, void *), void *data)
-{
-  struct prog *prog;
-
-  for (prog = proghead; prog; prog = prog->next)
-    if (IS_COMPONENT (prog)
-	&& !(prog->v.p.comp->mode == pies_comp_inetd
-	     && prog->v.p.listener)
-	&& fun (prog->v.p.comp, data))
-      break;
-}
 
 static struct prog *
 prog_lookup_by_pid (pid_t pid)
-- 
cgit v1.2.1