sort out yet more type issues
No binary (build failed)
—
(log yok)
| @@ -66,7 +66,7 @@ extern char get_header_cpio(archive_handle_t *archive_handle) | |
| /* There can be padding before archive header */ | |
| data_align(archive_handle, 4); | |
| - | if (archive_xread_all_eof(archive_handle, cpio_header, 110) == 0) { |
| + | if (archive_xread_all_eof(archive_handle, (unsigned char*)cpio_header, 110) == 0) { |
| return(EXIT_FAILURE); | |
| } | |
| archive_handle->offset += 110; | |
| @@ -453,7 +453,7 @@ extern int ipaddr_list_or_flush(int argc, char **argv, int flush) | |
| break; | |
| case 1: /* scope */ | |
| { | |
| - | int scope = 0; |
| + | uint32_t scope = 0; |
| NEXT_ARG(); | |
| filter.scopemask = -1; | |
| if (rtnl_rtscope_a2n(&scope, *argv)) { | |
| @@ -713,7 +713,7 @@ static int ipaddr_modify(int cmd, int argc, char **argv) | |
| } | |
| case 5: /* scope */ | |
| { | |
| - | int scope = 0; |
| + | uint32_t scope = 0; |
| NEXT_ARG(); | |
| if (rtnl_rtscope_a2n(&scope, *argv)) { | |
| invarg(*argv, "invalid scope value."); | |
| @@ -166,7 +166,7 @@ static int get_address(char *dev, int *htype) | |
| { | |
| struct ifreq ifr; | |
| struct sockaddr_ll me; | |
| - | int alen; |
| + | socklen_t alen; |
| int s; | |
| s = socket(PF_PACKET, SOCK_DGRAM, 0); | |
| @@ -211,7 +211,7 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr | |
| memset(ifr, 0, sizeof(*ifr)); | |
| strcpy(ifr->ifr_name, dev); | |
| ifr->ifr_hwaddr.sa_family = hatype; | |
| - | alen = ll_addr_a2n(ifr->ifr_hwaddr.sa_data, 14, lla); |
| + | alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), 14, lla); |
| if (alen < 0) | |
| return -1; | |
| if (alen != halen) { | |
| @@ -347,7 +347,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv) | |
| } | |
| rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu); | |
| } else if (matches(*argv, "protocol") == 0) { | |
| - | int prot; |
| + | uint32_t prot; |
| NEXT_ARG(); | |
| if (rtnl_rtprot_a2n(&prot, *argv)) | |
| invarg("\"protocol\" value is invalid\n", *argv); | |
| @@ -493,7 +493,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) | |
| while (argc > 0) { | |
| if (matches(*argv, "protocol") == 0) { | |
| - | int prot = 0; |
| + | uint32_t prot = 0; |
| NEXT_ARG(); | |
| filter.protocolmask = -1; | |
| if (rtnl_rtprot_a2n(&prot, *argv)) { | |
| @@ -30,7 +30,7 @@ void rtnl_close(struct rtnl_handle *rth) | |
| int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions) | |
| { | |
| - | int addr_len; |
| + | socklen_t addr_len; |
| memset(rth, 0, sizeof(rth)); | |
| @@ -164,7 +164,7 @@ int get_addr_1(inet_prefix * addr, char *name, int family) | |
| int get_prefix_1(inet_prefix * dst, char *arg, int family) | |
| { | |
| int err; | |
| - | unsigned plen; |
| + | int plen; |
| char *slash; | |
| memset(dst, 0, sizeof(*dst)); | |