deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #790 from nvt/fix-netdb-warnings

Browse source 
Avoid compilation warnings in Antelope.
This commit is contained in:
Nicolas Tsiftes 2014-09-05 20:37:52 +02:00
parent ad10f438c0 7738cdd15e
commit af5dcc628a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/antelope/lvm.c
View file

@ -586,7 +586,6 @@ derive_relation(lvm_instance_t *p, derivation_t *local_derivations)
node_type_t type; node_type_t type;
operand_t operand[2]; operand_t operand[2];
int i; int i;
int var;
int variable_id; int variable_id;
operand_value_t *value; operand_value_t *value;
derivation_t *derivation; derivation_t *derivation;
@ -640,11 +639,9 @@ derive_relation(lvm_instance_t *p, derivation_t *local_derivations)
if(operand[1].type == LVM_VARIABLE) { if(operand[1].type == LVM_VARIABLE) {
return DERIVATION_ERROR; return DERIVATION_ERROR;
} }
var = 0;
variable_id = operand[0].value.id; variable_id = operand[0].value.id;
value = &operand[1].value; value = &operand[1].value;
} else { } else {
var = 1;
variable_id = operand[1].value.id; variable_id = operand[1].value.id;
value = &operand[0].value; value = &operand[0].value;
} }

3
examples/antelope/netdb/netdb-server.c
View file

@ -36,6 +36,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "contiki.h" #include "contiki.h"
#include "dev/serial-line.h" #include "dev/serial-line.h"
@ -110,6 +111,7 @@ buffer_db_data(const char *format, ...)
return len; return len;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if !PREPARE_DB
static void static void
take_sample(void) take_sample(void)
{ {
@ -123,6 +125,7 @@ take_sample(void)
printf("DB insertion failed\n"); printf("DB insertion failed\n");
} }
} }
#endif /* !PREPARE_DB */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
stop_handler(void *ptr) stop_handler(void *ptr)