diff --git a/openbsc/src/gprs/gtphub.c b/openbsc/src/gprs/gtphub.c
index 809c555..190db22 100644
--- a/openbsc/src/gprs/gtphub.c
+++ b/openbsc/src/gprs/gtphub.c
@@ -414,9 +414,9 @@
 {
 	static char str[17];
 	int i;
-	char c;
 
 	for (i = 0; i < 8; i++) {
+		char c;
 		c = imsi_digit_to_char(imsi[i]);
 		if (c == '?')
 			return -1;
@@ -1095,12 +1095,6 @@
 	return gtphub_peer_strb(peer, buf, sizeof(buf));
 }
 
-const char *gtphub_peer_str2(struct gtphub_peer *peer)
-{
-	static char buf[256];
-	return gtphub_peer_strb(peer, buf, sizeof(buf));
-}
-
 const char *gtphub_port_str(struct gtphub_peer_port *port)
 {
 	static char buf[256];
@@ -1412,7 +1406,6 @@
 					struct gtphub_peer_port *from_ctrl,
 					struct gtphub_peer_port *to_ctrl)
 {
-	int rc;
 	int plane_idx;
 
 	/* TODO enforce a Request only from SGSN, a Response only from GGSN? */
@@ -1462,6 +1455,7 @@
 	unsigned int side_idx = p->side_idx;
 
 	for (plane_idx = 0; plane_idx < 2; plane_idx++) {
+		int rc;
 		struct gsn_addr addr_from_ie;
 		uint32_t tei_from_ie;
 		int ie_idx;
@@ -2169,8 +2163,6 @@
 int gtphub_start(struct gtphub *hub, struct gtphub_cfg *cfg,
 		 uint8_t restart_counter)
 {
-	int rc;
-
 	gtphub_init(hub);
 
 	hub->restart_counter = restart_counter;
@@ -2188,6 +2180,7 @@
 	int side_idx;
 	int plane_idx;
 	for_each_side_and_plane(side_idx, plane_idx) {
+		int rc;
 		rc = gtphub_bind_start(&hub->to_gsns[side_idx][plane_idx],
 				       &cfg->to_gsns[side_idx][plane_idx],
 				       (side_idx == GTPH_SIDE_SGSN)
diff --git a/openbsc/src/gprs/gtphub_main.c b/openbsc/src/gprs/gtphub_main.c
index a330b9d..0a7d383 100644
--- a/openbsc/src/gprs/gtphub_main.c
+++ b/openbsc/src/gprs/gtphub_main.c
@@ -82,9 +82,9 @@
 
 void log_cfg(struct gtphub_cfg *cfg)
 {
-	struct gtphub_cfg_addr *a;
 	int side_idx, plane_idx;
 	for_each_side_and_plane(side_idx, plane_idx) {
+		struct gtphub_cfg_addr *a;
 		a = &cfg->to_gsns[side_idx][plane_idx].bind;
 		LOGP(DGTPHUB, LOGL_NOTICE,
 		     "to-%ss bind, %s: %s port %d\n",
@@ -96,7 +96,7 @@
 
 static void signal_handler(int signal)
 {
-	fprintf(stdout, "signal %u received\n", signal);
+	fprintf(stdout, "signal %d received\n", signal);
 
 	switch (signal) {
 	case SIGINT: