diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 | 
| commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
| tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /net/core/utils.c | |
| parent | 6795a524f0b049ceb5417d5036ab5e233345b900 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'net/core/utils.c')
| -rw-r--r-- | net/core/utils.c | 9 | 
1 files changed, 3 insertions, 6 deletions
| diff --git a/net/core/utils.c b/net/core/utils.c index dc3c3faff2f..39895a65e54 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -58,14 +58,11 @@ __be32 in_aton(const char *str)  	int i;  	l = 0; -	for (i = 0; i < 4; i++) -	{ +	for (i = 0; i < 4; i++)	{  		l <<= 8; -		if (*str != '\0') -		{ +		if (*str != '\0') {  			val = 0; -			while (*str != '\0' && *str != '.' && *str != '\n') -			{ +			while (*str != '\0' && *str != '.' && *str != '\n') {  				val *= 10;  				val += *str - '0';  				str++; | 
