projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert sizeof foo to sizeof(foo).
[tinc]
/
src
/
solaris
/
device.c
diff --git
a/src/solaris/device.c
b/src/solaris/device.c
index
0074615
..
73046b8
100644
(file)
--- a/
src/solaris/device.c
+++ b/
src/solaris/device.c
@@
-115,7
+115,7
@@
static bool setup_device(void) {
struct strioctl strioc_ppa = {
.ic_cmd = TUNNEWPPA,
struct strioctl strioc_ppa = {
.ic_cmd = TUNNEWPPA,
- .ic_len = sizeof
ppa
,
+ .ic_len = sizeof
(ppa)
,
.ic_dp = (char *)&ppa,
};
.ic_dp = (char *)&ppa,
};
@@
-156,7
+156,7
@@
static bool setup_device(void) {
{
/* Remove muxes just in case they are left over from a crashed tincd */
struct lifreq ifr = {};
{
/* Remove muxes just in case they are left over from a crashed tincd */
struct lifreq ifr = {};
- strncpy(ifr.lifr_name, iface, sizeof
ifr.lifr_name
);
+ strncpy(ifr.lifr_name, iface, sizeof
(ifr.lifr_name)
);
if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
int muxid = ifr.lifr_arp_muxid;
ioctl(ip_fd, I_PUNLINK, muxid);
if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
int muxid = ifr.lifr_arp_muxid;
ioctl(ip_fd, I_PUNLINK, muxid);
@@
-229,7
+229,7
@@
static bool setup_device(void) {
/* Set ifname to arp */
struct strioctl strioc_if = {
.ic_cmd = SIOCSLIFNAME,
/* Set ifname to arp */
struct strioctl strioc_if = {
.ic_cmd = SIOCSLIFNAME,
- .ic_len = sizeof
ifr
,
+ .ic_len = sizeof
(ifr)
,
.ic_dp = (char *)&ifr,
};
.ic_dp = (char *)&ifr,
};
@@
-285,7
+285,7
@@
static bool setup_device(void) {
static void close_device(void) {
if(iface) {
struct lifreq ifr = {};
static void close_device(void) {
if(iface) {
struct lifreq ifr = {};
- strncpy(ifr.lifr_name, iface, sizeof
ifr.lifr_name
);
+ strncpy(ifr.lifr_name, iface, sizeof
(ifr.lifr_name)
);
if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
int muxid = ifr.lifr_arp_muxid;
ioctl(ip_fd, I_PUNLINK, muxid);
if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
int muxid = ifr.lifr_arp_muxid;
ioctl(ip_fd, I_PUNLINK, muxid);