diff options
| author | Andy Green <andy.green@linaro.org> | 2014-12-14 13:20:32 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2014-12-14 13:20:32 +0800 |
| commit | 0c39096830fa455642ad1970c8a28dcfac64a47f (patch) | |
| tree | 71020d133759be7eef4792bf8ca1f398b7571284 | |
| parent | 010fbd61be6058b925e585e4db3a34e34fced5ec (diff) | |
fix config parsing
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | aepd/websocket-protocol.c | 3 | ||||
| -rw-r--r-- | config | 2 | ||||
| -rwxr-xr-x | libarmep/configuration.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/aepd/websocket-protocol.c b/aepd/websocket-protocol.c index 666827d..073c211 100644 --- a/aepd/websocket-protocol.c +++ b/aepd/websocket-protocol.c @@ -64,7 +64,8 @@ static int callback_http(struct libwebsocket_context *context, if (libwebsockets_serve_http_file(context, wsi, buf, whitelist[n].mimetype, NULL, 0)) - fprintf(stderr, "Failed to send HTTP file\n"); + //fprintf(stderr, "Failed to send HTTP file\n"); + break; break; default: @@ -5,5 +5,5 @@ msm8916-qrd # <device path> /dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO12300012-if00 - V5.0 0.330000 -14.500000 -0.179000 13.363000 -0.000000 0.163300 0 V5.0 DC_IN #ff0000 SoC + V5.0 0.033000 -14.500000 -0.179000 13.363000 -0.000000 0.163300 0 V5.0 DC_IN #ff0000 SoC diff --git a/libarmep/configuration.c b/libarmep/configuration.c index 98070cd..2db43a4 100755 --- a/libarmep/configuration.c +++ b/libarmep/configuration.c @@ -239,7 +239,7 @@ int configure(struct aep_context *aep_context, struct aep *aep, const char *dev_ parser = ACPP_SKIP; continue; } - aep_context->device_paths[stanza++][copy_pos++] = c; + aep_context->device_paths[++stanza][copy_pos++] = c; aep_context->device_paths[stanza][copy_pos] = '\0'; actions = APCA_MATCH_DEVPATH; } |