From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 2 Mar 2014 23:45:17 +0000 (+0100)
Subject: build: remove duplicate const declaration
X-Git-Tag: 0.7.8~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcf5d2f72dc9924cbb3d589a5491183476c4fce6;p=thirdparty%2Flldpd.git

build: remove duplicate const declaration

clang complains about this. I don't remember why I did this.
---

diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c
index 931f7ddc..75289784 100644
--- a/src/daemon/interfaces-linux.c
+++ b/src/daemon/interfaces-linux.c
@@ -272,8 +272,8 @@ iflinux_get_permanent_mac(struct lldpd *cfg,
 	struct interfaces_device *master;
 	int f, state = 0;
 	FILE *netbond;
-	const char const *slaveif = "Slave Interface: ";
-	const char const *hwaddr = "Permanent HW addr: ";
+	const char *slaveif = "Slave Interface: ";
+	const char *hwaddr = "Permanent HW addr: ";
 	u_int8_t mac[ETHER_ADDR_LEN];
 	char path[SYSFS_PATH_MAX];
 	char line[100];
diff --git a/src/log.c b/src/log.c
index a3eebfa1..7bb128c4 100644
--- a/src/log.c
+++ b/src/log.c
@@ -38,7 +38,7 @@ static void	 vlog(int, const char *, const char *, va_list);
 static void	 logit(int, const char *, const char *, ...);
 
 #define MAX_DBG_TOKENS 40
-static const char const *tokens[MAX_DBG_TOKENS + 1] = {NULL};
+static const char *tokens[MAX_DBG_TOKENS + 1] = {NULL};
 
 void
 log_init(int n_debug, const char *progname)