Skip to content

Commit

Permalink
port/sockets.c: use u8_t instead of s8_t for subscripting arrays
Browse files Browse the repository at this point in the history
This fixes -Wchar-subscripts warnings

JIRA: COG-42
  • Loading branch information
mateuszkobak committed Oct 9, 2024
1 parent fd72583 commit 1f369ed
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions port/sockets.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ static int socket_ioctl6(int sock, unsigned long request, const void *in_data, v
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&in6_ifreq->ifr_ifru.ifru_addr;
ip6_addr_t ip6addr;
s8_t idx;
u8_t uidx;
int *flags;
struct in6_addrlifetime *lifetime;

Expand All @@ -205,19 +206,20 @@ static int socket_ioctl6(int sock, unsigned long request, const void *in_data, v
if (idx < 0) {
return -ENXIO;
}
uidx = (u8_t)idx;

switch (request) {
case SIOCGIFNETMASK_IN6:
inet6_addr_netmask_from_ip6addr(&sin6->sin6_addr, &ip6addr);
break;
case SIOCGIFAFLAG_IN6:
flags = &in6_ifreq->ifr_ifru.ifru_flags6;
*flags = netif_ip6_flags(netif, idx);
*flags = netif_ip6_flags(netif, uidx);
break;
case SIOCGIFALIFETIME_IN6:
lifetime = (struct in6_addrlifetime *)&in6_ifreq->ifr_ifru.ifru_lifetime;
lifetime->preferred = netif_ip6_addr_pref_life(netif, idx);
lifetime->expire = netif_ip6_addr_valid_life(netif, idx);
lifetime->preferred = netif_ip6_addr_pref_life(netif, uidx);
lifetime->expire = netif_ip6_addr_valid_life(netif, uidx);
break;
}
return EOK;
Expand Down Expand Up @@ -257,6 +259,7 @@ static int socket_ioctl6(int sock, unsigned long request, const void *in_data, v
struct sockaddr_in6 sin6;
ip6_addr_t ip6addr;
s8_t idx;
u8_t uidx;

if (netif == NULL) {
return -ENXIO;
Expand All @@ -274,8 +277,10 @@ static int socket_ioctl6(int sock, unsigned long request, const void *in_data, v
return -ENOMEM;
}

netif_ip6_addr_set_pref_life(netif, idx, in6_ifreq->ifra_lifetime.preferred);
netif_ip6_addr_set_valid_life(netif, idx, in6_ifreq->ifra_lifetime.expire);
uidx = (u8_t)idx;

netif_ip6_addr_set_pref_life(netif, uidx, in6_ifreq->ifra_lifetime.preferred);
netif_ip6_addr_set_valid_life(netif, uidx, in6_ifreq->ifra_lifetime.expire);
/* Ignore flags and netmask */

return EOK;
Expand Down

0 comments on commit 1f369ed

Please sign in to comment.