From 566c635dd60589e6ac878ca25a99fb6dcf343961 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <bernat@luffy.cx>
Date: Tue, 24 Jan 2012 10:37:38 +0100
Subject: [PATCH] lldpd: remove unneeded forward declarations

---
 src/lldpd.c | 93 +++++++++++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 57 deletions(-)

diff --git a/src/lldpd.c b/src/lldpd.c
index 7f99d9ff..cecc8a83 100644
--- a/src/lldpd.c
+++ b/src/lldpd.c
@@ -73,27 +73,6 @@ static struct protocol protos[] =
 	  {0,0,0,0,0,0} }
 };
 
-static void		 lldpd_update_localchassis(struct lldpd *);
-static void		 lldpd_update_localports(struct lldpd *);
-static void		 lldpd_cleanup(struct lldpd *);
-static void		 lldpd_loop(struct lldpd *);
-static void		 lldpd_shutdown(int);
-static void		 lldpd_exit(void);
-static void		 lldpd_send_all(struct lldpd *);
-static void		 lldpd_recv_all(struct lldpd *);
-static void		 lldpd_hide_all(struct lldpd *);
-static void		 lldpd_hide_ports(struct lldpd *, struct lldpd_hardware *, int);
-static int		 lldpd_guess_type(struct lldpd *, char *, int);
-static void		 lldpd_decode(struct lldpd *, char *, int,
-			    struct lldpd_hardware *);
-static void		 lldpd_update_chassis(struct lldpd_chassis *,
-			    const struct lldpd_chassis *);
-static char 		*lldpd_get_lsb_release(void);
-static char		*lldpd_get_os_release(void);
-#ifdef ENABLE_LLDPMED
-static void		 lldpd_med(struct lldpd_chassis *);
-#endif
-
 static char		**saved_argv;
 #ifdef HAVE___PROGNAME
 extern const char	*__progname;
@@ -351,6 +330,26 @@ lldpd_cleanup(struct lldpd *cfg)
 	}
 }
 
+/* Update chassis `ochassis' with values from `chassis'. */
+static void
+lldpd_update_chassis(struct lldpd_chassis *ochassis,
+    const struct lldpd_chassis *chassis) {
+	TAILQ_ENTRY(lldpd_chassis) entries;
+	/* We want to keep refcount, index and list stuff from the current
+	 * chassis */
+	int refcount = ochassis->c_refcount;
+	int index = ochassis->c_index;
+	memcpy(&entries, &ochassis->c_entries,
+	    sizeof(entries));
+	/* Make the copy */
+	lldpd_chassis_cleanup(ochassis, 0);
+	memcpy(ochassis, chassis, sizeof(struct lldpd_chassis));
+	/* Restore saved values */
+	ochassis->c_refcount = refcount;
+	ochassis->c_index = index;
+	memcpy(&ochassis->c_entries, &entries, sizeof(entries));
+}
+
 static int
 lldpd_guess_type(struct lldpd *cfg, char *frame, int s)
 {
@@ -493,26 +492,6 @@ lldpd_decode(struct lldpd *cfg, char *frame, int s,
 	return;
 }
 
-/* Update chassis `ochassis' with values from `chassis'. */
-static void
-lldpd_update_chassis(struct lldpd_chassis *ochassis,
-    const struct lldpd_chassis *chassis) {
-	TAILQ_ENTRY(lldpd_chassis) entries;
-	/* We want to keep refcount, index and list stuff from the current
-	 * chassis */
-	int refcount = ochassis->c_refcount;
-	int index = ochassis->c_index;
-	memcpy(&entries, &ochassis->c_entries,
-	    sizeof(entries));
-	/* Make the copy */
-	lldpd_chassis_cleanup(ochassis, 0);
-	memcpy(ochassis, chassis, sizeof(struct lldpd_chassis));
-	/* Restore saved values */
-	ochassis->c_refcount = refcount;
-	ochassis->c_index = index;
-	memcpy(&ochassis->c_entries, &entries, sizeof(entries));
-}
-
 /* Get the output of lsb_release -s -d.  This is a slow function. It should be
    called once. It return NULL if any problem happens. Otherwise, this is a
    statically allocated buffer. The result includes the trailing \n  */
@@ -656,22 +635,6 @@ lldpd_callback_del(struct lldpd *cfg, int fd, void(*fn)(CALLBACK_SIG))
 	}
 }
 
-/* Hide unwanted ports depending on smart mode set by the user */
-static void
-lldpd_hide_all(struct lldpd *cfg)
-{
-	struct lldpd_hardware *hardware;
-
-	if (!cfg->g_smart)
-		return;
-	TAILQ_FOREACH(hardware, &cfg->g_hardware, h_entries) {
-		if (cfg->g_smart & SMART_INCOMING_FILTER)
-			lldpd_hide_ports(cfg, hardware, SMART_INCOMING);
-		if (cfg->g_smart & SMART_OUTGOING_FILTER)
-			lldpd_hide_ports(cfg, hardware, SMART_OUTGOING);
-	}
-}
-
 static void
 lldpd_hide_ports(struct lldpd *cfg, struct lldpd_hardware *hardware, int mask) {
 	struct lldpd_port *port;
@@ -759,6 +722,22 @@ lldpd_hide_ports(struct lldpd *cfg, struct lldpd_hardware *hardware, int mask) {
 		   hardware->h_ifname, k, j, buffer[0]?buffer:"(none)");
 }
 
+/* Hide unwanted ports depending on smart mode set by the user */
+static void
+lldpd_hide_all(struct lldpd *cfg)
+{
+	struct lldpd_hardware *hardware;
+
+	if (!cfg->g_smart)
+		return;
+	TAILQ_FOREACH(hardware, &cfg->g_hardware, h_entries) {
+		if (cfg->g_smart & SMART_INCOMING_FILTER)
+			lldpd_hide_ports(cfg, hardware, SMART_INCOMING);
+		if (cfg->g_smart & SMART_OUTGOING_FILTER)
+			lldpd_hide_ports(cfg, hardware, SMART_OUTGOING);
+	}
+}
+
 static void
 lldpd_recv_all(struct lldpd *cfg)
 {
-- 
2.39.5