diff options
| author | Joe Perches <joe@perches.com> | 2014-06-24 14:20:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-25 20:45:43 -0400 |
| commit | a69f5edb8ba20c87c5f7c96ec40581f9f51f2910 (patch) | |
| tree | 61cf5f07b616790a35527c1dfe746a18304f0f7a | |
| parent | f6d8cb2eeded7df18b821a321d4cd1cdd1754bf8 (diff) | |
mac_pton: Use bool not int return
Use bool instead of int as the return type.
All uses are tested with !.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/kernel.h | 2 | ||||
| -rw-r--r-- | lib/net_utils.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 4c52907a6d8b..a9e2268ecccb 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -501,7 +501,7 @@ static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) | |||
| 501 | extern int hex_to_bin(char ch); | 501 | extern int hex_to_bin(char ch); |
| 502 | extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); | 502 | extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); |
| 503 | 503 | ||
| 504 | int mac_pton(const char *s, u8 *mac); | 504 | bool mac_pton(const char *s, u8 *mac); |
| 505 | 505 | ||
| 506 | /* | 506 | /* |
| 507 | * General tracing related utility functions - trace_printk(), | 507 | * General tracing related utility functions - trace_printk(), |
diff --git a/lib/net_utils.c b/lib/net_utils.c index 2e3c52c8d050..148fc6e99ef6 100644 --- a/lib/net_utils.c +++ b/lib/net_utils.c | |||
| @@ -3,24 +3,24 @@ | |||
| 3 | #include <linux/ctype.h> | 3 | #include <linux/ctype.h> |
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | 5 | ||
| 6 | int mac_pton(const char *s, u8 *mac) | 6 | bool mac_pton(const char *s, u8 *mac) |
| 7 | { | 7 | { |
| 8 | int i; | 8 | int i; |
| 9 | 9 | ||
| 10 | /* XX:XX:XX:XX:XX:XX */ | 10 | /* XX:XX:XX:XX:XX:XX */ |
| 11 | if (strlen(s) < 3 * ETH_ALEN - 1) | 11 | if (strlen(s) < 3 * ETH_ALEN - 1) |
| 12 | return 0; | 12 | return false; |
| 13 | 13 | ||
| 14 | /* Don't dirty result unless string is valid MAC. */ | 14 | /* Don't dirty result unless string is valid MAC. */ |
| 15 | for (i = 0; i < ETH_ALEN; i++) { | 15 | for (i = 0; i < ETH_ALEN; i++) { |
| 16 | if (!isxdigit(s[i * 3]) || !isxdigit(s[i * 3 + 1])) | 16 | if (!isxdigit(s[i * 3]) || !isxdigit(s[i * 3 + 1])) |
| 17 | return 0; | 17 | return false; |
| 18 | if (i != ETH_ALEN - 1 && s[i * 3 + 2] != ':') | 18 | if (i != ETH_ALEN - 1 && s[i * 3 + 2] != ':') |
| 19 | return 0; | 19 | return false; |
| 20 | } | 20 | } |
| 21 | for (i = 0; i < ETH_ALEN; i++) { | 21 | for (i = 0; i < ETH_ALEN; i++) { |
| 22 | mac[i] = (hex_to_bin(s[i * 3]) << 4) | hex_to_bin(s[i * 3 + 1]); | 22 | mac[i] = (hex_to_bin(s[i * 3]) << 4) | hex_to_bin(s[i * 3 + 1]); |
| 23 | } | 23 | } |
| 24 | return 1; | 24 | return true; |
| 25 | } | 25 | } |
| 26 | EXPORT_SYMBOL(mac_pton); | 26 | EXPORT_SYMBOL(mac_pton); |