Commit a69f5edb authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

mac_pton: Use bool not int return 



Use bool instead of int as the return type.

All uses are tested with !.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6d8cb2e

include/linux/kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) 
extern int hex_to_bin(char ch);

extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);



int mac_pton(const char *s, u8 *mac);

bool mac_pton(const char *s, u8 *mac);



/*

 * General tracing related utility functions - trace_printk(),

lib/net_utils.c

+5 −5
Original line number Diff line number Diff line
@@ -3,24 +3,24 @@ 
#include <linux/ctype.h>

#include <linux/kernel.h>



int mac_pton(const char *s, u8 *mac)

bool mac_pton(const char *s, u8 *mac)

{

	int i;



	/* XX:XX:XX:XX:XX:XX */

	if (strlen(s) < 3 * ETH_ALEN - 1)

		return 0;

		return false;



	/* Don't dirty result unless string is valid MAC. */

	for (i = 0; i < ETH_ALEN; i++) {

		if (!isxdigit(s[i * 3]) || !isxdigit(s[i * 3 + 1]))

			return 0;

			return false;

		if (i != ETH_ALEN - 1 && s[i * 3 + 2] != ':')

			return 0;

			return false;

	}

	for (i = 0; i < ETH_ALEN; i++) {

		mac[i] = (hex_to_bin(s[i * 3]) << 4) | hex_to_bin(s[i * 3 + 1]);

	}

	return 1;

	return true;

}

EXPORT_SYMBOL(mac_pton);