From fcb246d4bf283d7d57e8628837bdb0690c5d0c1f Mon Sep 17 00:00:00 2001 From: Joakim Eriksson Date: Fri, 25 May 2018 16:20:47 +0200 Subject: [PATCH 1/2] fixed endpoint name to have Contiki-NG as prefix --- os/services/lwm2m/lwm2m-engine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os/services/lwm2m/lwm2m-engine.c b/os/services/lwm2m/lwm2m-engine.c index 6f2aeefd8..7977e8921 100644 --- a/os/services/lwm2m/lwm2m-engine.c +++ b/os/services/lwm2m/lwm2m-engine.c @@ -68,9 +68,9 @@ #ifndef LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX #ifdef LWM2M_DEVICE_MODEL_NUMBER -#define LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX LWM2M_DEVICE_MODEL_NUMBER +#define LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX "Contiki-NG-"LWM2M_DEVICE_MODEL_NUMBER #else /* LWM2M_DEVICE_MODEL_NUMBER */ -#define LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX "Contiki-" +#define LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX "Contiki-NG" #endif /* LWM2M_DEVICE_MODEL_NUMBER */ #endif /* LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX */ From bcb4548519f620c2111a9d1917e6415dec5ffe69 Mon Sep 17 00:00:00 2001 From: Joakim Eriksson Date: Fri, 25 May 2018 16:21:45 +0200 Subject: [PATCH 2/2] ensured initialization of success variable --- os/services/lwm2m/lwm2m-engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/services/lwm2m/lwm2m-engine.c b/os/services/lwm2m/lwm2m-engine.c index 7977e8921..dd76212a9 100644 --- a/os/services/lwm2m/lwm2m-engine.c +++ b/os/services/lwm2m/lwm2m-engine.c @@ -746,7 +746,7 @@ perform_multi_resource_read_op(lwm2m_object_t *object, } /* ---------- Read operation ------------- */ } else if(ctx->operation == LWM2M_OP_READ) { - lwm2m_status_t success; + lwm2m_status_t success = 0; uint8_t lv; lv = ctx->level;