diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-01-24 17:36:39 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-01-24 17:36:39 +0100 |
commit | cb5d8473d73ae42168f39383acd62c7ca42de04a (patch) | |
tree | fd650e71bc7512fb9608c2ac30811e232833df2e | |
parent | c17070464fb3ede78de66d03800ca6ab08ede885 (diff) |
move variable declarations out of the 'for' loop
this fixes compilation with gcc-4.8
-rw-r--r-- | src/diag_dpl.c | 3 | ||||
-rw-r--r-- | src/diag_msg.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/diag_dpl.c b/src/diag_dpl.c index b9fd901..b5a1bb0 100644 --- a/src/diag_dpl.c +++ b/src/diag_dpl.c @@ -97,11 +97,12 @@ int diag_dpl_set_if_log(struct diag_instance *di, uint8_t iface_id, struct msgb *msg = msgb_alloc_diag(); struct dpl_set_if_log_req *silr; struct msgb *rx; + int i; silr = (struct dpl_set_if_log_req *) msgb_put(msg, sizeof(*silr)); silr->iface_id = iface_id; silr->num_log_flags = 0; - for (int i = 0; i < 1; i++) { + for (i = 0; i < 1; i++) { msgb_put(msg, sizeof(silr->log_flags[0])); silr->num_log_flags++; iid.link_instance = i; diff --git a/src/diag_msg.c b/src/diag_msg.c index 4d79b7f..1067b03 100644 --- a/src/diag_msg.c +++ b/src/diag_msg.c @@ -86,6 +86,7 @@ static void diag_rx_ext_msg_f(struct diag_instance *di, struct msgb *msgb) struct ext_log_msg *msg; char *file = NULL, *fmt; unsigned int num_args; + char *cur; if (len < sizeof(struct ext_log_msg)) { printf("too short ext_log_msg.\n"); @@ -102,7 +103,7 @@ static void diag_rx_ext_msg_f(struct diag_instance *di, struct msgb *msgb) file, osmo_load16le(&msg->line_nr)); /* replace all '%s' with '%p', as %s obviously doesn't work */ - for (char *cur = strstr(fmt, "%s"); cur && (cur < fmt + strlen(fmt)); cur = strstr(fmt, "%s")) { + for (cur = strstr(fmt, "%s"); cur && (cur < fmt + strlen(fmt)); cur = strstr(fmt, "%s")) { cur[1] = 'p'; } |