Skip to content

Commit 67ad908

Browse files
committed
now it is pedantic warnings free
1 parent 2bd0f38 commit 67ad908

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ project("vdeplug_pcap"
88
include(GNUInstallDirs)
99
include(CheckIncludeFile)
1010
include(CheckSymbolExists)
11+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2 -O2 -pedantic -Wall -Wextra")
12+
1113

1214
set(CMAKE_REQUIRED_QUIET TRUE)
1315
set(LIBS_REQUIRED vdeplug_mod pcap)

libvdeplug_pcap.c

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#include "libvdeplug_mod.h"
3636
#include <pcap.h>
3737

38-
static VDECONN *vde_pcap_open(char *given_vde_url, char *descr,int interface_version,
38+
static VDECONN *vde_pcap_open(char *given_vde_url, char *descr, int interface_version,
3939
struct vde_open_args *open_args);
40-
static ssize_t vde_pcap_recv(VDECONN *conn,void *buf,size_t len,int flags);
41-
static ssize_t vde_pcap_send(VDECONN *conn,const void *buf,size_t len,int flags);
40+
static ssize_t vde_pcap_recv(VDECONN *conn, void *buf, size_t len, int flags);
41+
static ssize_t vde_pcap_send(VDECONN *conn, const void *buf, size_t len, int flags);
4242
static int vde_pcap_datafd(VDECONN *conn);
4343
static int vde_pcap_ctlfd(VDECONN *conn);
4444
static int vde_pcap_close(VDECONN *conn);
@@ -62,10 +62,10 @@ struct vde_pcap_conn {
6262

6363
static void gethwaddr(const char *ifname, char *hwaddr) {
6464
int s;
65-
int ioctlok;
65+
int ioctlok = 0;
6666
struct ifreq ifr;
67-
strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
68-
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) > 0) {
67+
snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", ifname);
68+
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
6969
ioctlok = ioctl(s, SIOCGIFHWADDR, &ifr);
7070
close(s);
7171
}
@@ -75,12 +75,15 @@ static void gethwaddr(const char *ifname, char *hwaddr) {
7575
memcpy(hwaddr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
7676
}
7777

78-
static VDECONN *vde_pcap_open(char *given_vde_url, char *descr,int interface_version,
78+
static VDECONN *vde_pcap_open(char *given_vde_url, char *descr, int interface_version,
7979
struct vde_open_args *open_args)
8080
{
81+
(void) descr;
82+
(void) interface_version;
83+
(void) open_args;
8184
struct vde_pcap_conn *newconn;
8285
char *ifname = given_vde_url;
83-
if ((newconn=calloc(1,sizeof(struct vde_pcap_conn)))==NULL) {
86+
if ((newconn=calloc(1, sizeof(struct vde_pcap_conn)))==NULL) {
8487
errno=ENOMEM;
8588
return NULL;
8689
}
@@ -120,8 +123,9 @@ static VDECONN *vde_pcap_open(char *given_vde_url, char *descr,int interface_ver
120123
return NULL;
121124
}
122125

123-
static ssize_t vde_pcap_recv(VDECONN *conn,void *buf,size_t len,int flags)
126+
static ssize_t vde_pcap_recv(VDECONN *conn, void *buf, size_t len, int flags)
124127
{
128+
(void) flags;
125129
struct vde_pcap_conn *vde_conn = (struct vde_pcap_conn *)conn;
126130
const u_char *data;
127131
struct pcap_pkthdr hdr;
@@ -138,8 +142,9 @@ static ssize_t vde_pcap_recv(VDECONN *conn,void *buf,size_t len,int flags)
138142
return 1;
139143
}
140144

141-
static ssize_t vde_pcap_send(VDECONN *conn,const void *buf,size_t len,int flags)
145+
static ssize_t vde_pcap_send(VDECONN *conn, const void *buf, size_t len, int flags)
142146
{
147+
(void) flags;
143148
struct vde_pcap_conn *vde_conn = (struct vde_pcap_conn *)conn;
144149
return pcap_inject(vde_conn->pcap, buf, len);
145150
}
@@ -152,6 +157,7 @@ static int vde_pcap_datafd(VDECONN *conn)
152157

153158
static int vde_pcap_ctlfd(VDECONN *conn)
154159
{
160+
(void) conn;
155161
return -1;
156162
}
157163

0 commit comments

Comments
 (0)