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

Merge pull request #1334 from tadodotcom/1333-resolv-fat-camp

Browse source 
trims resolv.c by removing unrequired static declarations
This commit is contained in:
Simon Duquennoy 2016-03-14 16:41:33 +01:00
parent 364afcf204 fbc5b5300d
commit bbefd4ab4e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/net/ip/resolv.c
View file

@ -783,9 +783,9 @@ check_entries(void)
static void static void
newdata(void) newdata(void)
{ {
static uint8_t nquestions, nanswers; uint8_t nquestions, nanswers;
static int8_t i; int8_t i;
register struct namemap *namemapptr = NULL; register struct namemap *namemapptr = NULL;
@ -872,7 +872,7 @@ newdata(void)
} }
return; return;
} else { } else {
static uint8_t nauthrr; uint8_t nauthrr;
PRINTF("resolver: But we are still probing. Waiting...\n"); PRINTF("resolver: But we are still probing. Waiting...\n");
/* We are still probing. We need to do the mDNS /* We are still probing. We need to do the mDNS
* probe race condition check here and make sure * probe race condition check here and make sure
@ -960,7 +960,7 @@ newdata(void)
#endif /* !ARCH_DOESNT_NEED_ALIGNED_STRUCTS */ #endif /* !ARCH_DOESNT_NEED_ALIGNED_STRUCTS */
#if VERBOSE_DEBUG #if VERBOSE_DEBUG
static char debug_name[40]; char debug_name[40];
decode_name(queryptr, debug_name, uip_appdata); decode_name(queryptr, debug_name, uip_appdata);
DEBUG_PRINTF("resolver: Answer %d: \"%s\", type %d, class %d, ttl %d, length %d\n", DEBUG_PRINTF("resolver: Answer %d: \"%s\", type %d, class %d, ttl %d, length %d\n",
++i, debug_name, uip_ntohs(ans->type), ++i, debug_name, uip_ntohs(ans->type),
@ -1266,9 +1266,9 @@ remove_trailing_dots(const char *name) {
void void
resolv_query(const char *name) resolv_query(const char *name)
{ {
static uint8_t i; uint8_t i;
static uint8_t lseq, lseqi; uint8_t lseq, lseqi;
register struct namemap *nameptr = 0; register struct namemap *nameptr = 0;
@ -1315,7 +1315,7 @@ resolv_query(const char *name)
{ {
size_t name_len = strlen(name); size_t name_len = strlen(name);
static const char local_suffix[] = "local"; const char local_suffix[] = "local";
if((name_len > (sizeof(local_suffix) - 1)) && if((name_len > (sizeof(local_suffix) - 1)) &&
(0 == strcasecmp(name + name_len - (sizeof(local_suffix) - 1), local_suffix))) { (0 == strcasecmp(name + name_len - (sizeof(local_suffix) - 1), local_suffix))) {
@ -1347,7 +1347,7 @@ resolv_lookup(const char *name, uip_ipaddr_t ** ipaddr)
{ {
resolv_status_t ret = RESOLV_STATUS_UNCACHED; resolv_status_t ret = RESOLV_STATUS_UNCACHED;
static uint8_t i; uint8_t i;
struct namemap *nameptr; struct namemap *nameptr;