| Index: fusl/src/network/lookup_ipliteral.c | 
| diff --git a/fusl/src/network/lookup_ipliteral.c b/fusl/src/network/lookup_ipliteral.c | 
| index 8ed14605238ef642168213508f81218f32280e1c..8beffa62f83b1c8c1b4203703f14e1c731e63bce 100644 | 
| --- a/fusl/src/network/lookup_ipliteral.c | 
| +++ b/fusl/src/network/lookup_ipliteral.c | 
| @@ -9,49 +9,53 @@ | 
| #include <ctype.h> | 
| #include "lookup.h" | 
|  | 
| -int __inet_aton(const char *, struct in_addr *); | 
| +int __inet_aton(const char*, struct in_addr*); | 
|  | 
| -int __lookup_ipliteral(struct address buf[static 1], const char *name, int family) | 
| -{ | 
| -	struct in_addr a4; | 
| -	struct in6_addr a6; | 
| -	if (__inet_aton(name, &a4) > 0) { | 
| -		if (family == AF_INET6) /* wrong family */ | 
| -			return EAI_NONAME; | 
| -		memcpy(&buf[0].addr, &a4, sizeof a4); | 
| -		buf[0].family = AF_INET; | 
| -		buf[0].scopeid = 0; | 
| -		return 1; | 
| -	} | 
| +int __lookup_ipliteral(struct address buf[static 1], | 
| +                       const char* name, | 
| +                       int family) { | 
| +  struct in_addr a4; | 
| +  struct in6_addr a6; | 
| +  if (__inet_aton(name, &a4) > 0) { | 
| +    if (family == AF_INET6) /* wrong family */ | 
| +      return EAI_NONAME; | 
| +    memcpy(&buf[0].addr, &a4, sizeof a4); | 
| +    buf[0].family = AF_INET; | 
| +    buf[0].scopeid = 0; | 
| +    return 1; | 
| +  } | 
|  | 
| -	char tmp[64]; | 
| -	char *p = strchr(name, '%'), *z; | 
| -	unsigned long long scopeid = 0; | 
| -	if (p && p-name < 64) { | 
| -		memcpy(tmp, name, p-name); | 
| -		tmp[p-name] = 0; | 
| -		name = tmp; | 
| -	} | 
| +  char tmp[64]; | 
| +  char *p = strchr(name, '%'), *z; | 
| +  unsigned long long scopeid = 0; | 
| +  if (p && p - name < 64) { | 
| +    memcpy(tmp, name, p - name); | 
| +    tmp[p - name] = 0; | 
| +    name = tmp; | 
| +  } | 
|  | 
| -	if (inet_pton(AF_INET6, name, &a6) <= 0) | 
| -		return 0; | 
| -	if (family == AF_INET) /* wrong family */ | 
| -		return EAI_NONAME; | 
| +  if (inet_pton(AF_INET6, name, &a6) <= 0) | 
| +    return 0; | 
| +  if (family == AF_INET) /* wrong family */ | 
| +    return EAI_NONAME; | 
|  | 
| -	memcpy(&buf[0].addr, &a6, sizeof a6); | 
| -	buf[0].family = AF_INET6; | 
| -	if (p) { | 
| -		if (isdigit(*++p)) scopeid = strtoull(p, &z, 10); | 
| -		else z = p-1; | 
| -		if (*z) { | 
| -			if (!IN6_IS_ADDR_LINKLOCAL(&a6) && | 
| -			    !IN6_IS_ADDR_MC_LINKLOCAL(&a6)) | 
| -				return EAI_NONAME; | 
| -			scopeid = if_nametoindex(p); | 
| -			if (!scopeid) return EAI_NONAME; | 
| -		} | 
| -		if (scopeid > UINT_MAX) return EAI_NONAME; | 
| -	} | 
| -	buf[0].scopeid = scopeid; | 
| -	return 1; | 
| +  memcpy(&buf[0].addr, &a6, sizeof a6); | 
| +  buf[0].family = AF_INET6; | 
| +  if (p) { | 
| +    if (isdigit(*++p)) | 
| +      scopeid = strtoull(p, &z, 10); | 
| +    else | 
| +      z = p - 1; | 
| +    if (*z) { | 
| +      if (!IN6_IS_ADDR_LINKLOCAL(&a6) && !IN6_IS_ADDR_MC_LINKLOCAL(&a6)) | 
| +        return EAI_NONAME; | 
| +      scopeid = if_nametoindex(p); | 
| +      if (!scopeid) | 
| +        return EAI_NONAME; | 
| +    } | 
| +    if (scopeid > UINT_MAX) | 
| +      return EAI_NONAME; | 
| +  } | 
| +  buf[0].scopeid = scopeid; | 
| +  return 1; | 
| } | 
|  |