diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-13 12:38:47 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-13 12:38:47 +0000 |
| commit | c41f3cf10a99f055337e884f8bf6c5a612047efb (patch) | |
| tree | c873f980911fe63842b5598ede8a2ffa8e46825e /usr/src/boot/lib/libstand/net.c | |
| parent | 185a422e63f55e51465370d497ca1c1a13366df4 (diff) | |
| parent | 6640c13beae5a8b03718dc6b7a9cda5dd6ab9024 (diff) | |
| download | illumos-joyent-c41f3cf10a99f055337e884f8bf6c5a612047efb.tar.gz | |
[illumos-gate merge]
commit 6640c13beae5a8b03718dc6b7a9cda5dd6ab9024
9718 update mandoc to 1.14.4
commit 9fd537180d8c7ca186c4842f6262016f5e418d10
9668 loader: rename zfsloader to loader
commit a942f1f5f0eafb4e2a9cf5d6cff385b7830676e6
9715 libstand: gzipfs unused variable
commit 567af71db40b696d77b6f0112d8cb20c4dc3ad93
9714 libstand: dereferencing type-punned pointer will break strict-aliasing rules
commit 5620b343930008e3d99871d6563033c0cbe44afa
9713 libstand: cd9660 pointers differ in signedness
commit 27d539f2d4b4c40e9fc667f8b1319ed290c6e4b3
9712 libstand: netif.c variable set but not used
commit 380059927f2f5af9148793463b305037707f8613
9708 loader: libstand warning: pointer targets differ in signedness
commit cb41b9c565d4eec9e1f06e24d429696f59f2f07d
9674 Let's scrap AVS/sdbc
Conflicts:
usr/src/lib/Makefile
Diffstat (limited to 'usr/src/boot/lib/libstand/net.c')
| -rw-r--r-- | usr/src/boot/lib/libstand/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/boot/lib/libstand/net.c b/usr/src/boot/lib/libstand/net.c index 7d775faf17..ae2590a327 100644 --- a/usr/src/boot/lib/libstand/net.c +++ b/usr/src/boot/lib/libstand/net.c @@ -266,7 +266,7 @@ intoa(n_long addr) } static char * -number(char *s, int *n) +number(char *s, uint32_t *n) { for (*n = 0; isdigit(*s); s++) *n = (*n * 10) + *s - '0'; @@ -277,7 +277,7 @@ n_long ip_convertaddr(char *p) { #define IP_ANYADDR 0 - n_long addr = 0, n; + uint32_t addr = 0, n; if (p == NULL || *p == '\0') return (IP_ANYADDR); |