mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
bc62f54146
* Fix the not updated `PKG_TEMP_DIR` to `PKG_BUILDDIR` * Bump the version * Make the patches apply and fix warnings/errors
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 63d29e3038c3cfd70cf10ee168f78209e29ae5d2 Mon Sep 17 00:00:00 2001
|
|
From: Christian Manal <moenoel@informatik.uni-bremen.de>
|
|
Date: Wed, 29 Nov 2017 15:28:51 +0100
|
|
Subject: [PATCH 08/12] fixed warnings in bootstrap.c
|
|
|
|
---
|
|
core/bootstrap.c | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/core/bootstrap.c b/core/bootstrap.c
|
|
index 611566b..d0fc0c8 100644
|
|
--- a/core/bootstrap.c
|
|
+++ b/core/bootstrap.c
|
|
@@ -148,11 +148,11 @@ void bootstrap_step(lwm2m_context_t * contextP,
|
|
break;
|
|
|
|
case STATE_BS_HOLD_OFF:
|
|
- if (targetP->registration <= currentTime)
|
|
+ if (targetP->registration <= (time_t)currentTime)
|
|
{
|
|
prv_requestBootstrap(contextP, targetP);
|
|
}
|
|
- else if (*timeoutP > targetP->registration - currentTime)
|
|
+ else if (*timeoutP > targetP->registration - (time_t)currentTime)
|
|
{
|
|
*timeoutP = targetP->registration - currentTime;
|
|
}
|
|
@@ -163,12 +163,12 @@ void bootstrap_step(lwm2m_context_t * contextP,
|
|
break;
|
|
|
|
case STATE_BS_PENDING:
|
|
- if (targetP->registration <= currentTime)
|
|
+ if (targetP->registration <= (time_t)currentTime)
|
|
{
|
|
targetP->status = STATE_BS_FAILING;
|
|
*timeoutP = 0;
|
|
}
|
|
- else if (*timeoutP > targetP->registration - currentTime)
|
|
+ else if (*timeoutP > targetP->registration - (time_t)currentTime)
|
|
{
|
|
*timeoutP = targetP->registration - currentTime;
|
|
}
|
|
@@ -375,6 +375,7 @@ uint8_t bootstrap_handleCommand(lwm2m_context_t * contextP,
|
|
{
|
|
uint8_t result;
|
|
lwm2m_media_type_t format;
|
|
+ (void)response;
|
|
|
|
LOG_ARG("Code: %02X", message->code);
|
|
LOG_URI(uriP);
|
|
@@ -582,6 +583,8 @@ uint8_t bootstrap_handleRequest(lwm2m_context_t * contextP,
|
|
{
|
|
uint8_t result;
|
|
char * name;
|
|
+ (void)uriP;
|
|
+ (void)response;
|
|
|
|
LOG_URI(uriP);
|
|
if (contextP->bootstrapCallback == NULL) return COAP_500_INTERNAL_SERVER_ERROR;
|
|
--
|
|
2.1.4
|
|
|