move variable declarations out of the 'for' loop

this fixes compilation with gcc-4.8
This commit is contained in:
Harald Welte 2017-01-24 17:36:39 +01:00
parent c17070464f
commit cb5d8473d7
2 changed files with 4 additions and 2 deletions

View File

@ -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;

View File

@ -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';
}