d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netmap: fix constness warnings generated by "-Wcast-qual"

Browse Source 
Submitted by:	milosz.kaniewski@gmail.com
MFC after:	3 days
This commit is contained in:
Vincenzo Maffione 2020-10-03 09:33:29 +00:00
parent ed188a7ece
commit adf41f0788
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=366388
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/netmap_user.h
View File

@ -290,7 +290,7 @@ struct nm_desc {
* when the descriptor is open correctly, d->self == d
* Eventually we should also use some magic number.
*/
#define P2NMD(p) ((struct nm_desc *)(p))
#define P2NMD(p) ((const struct nm_desc *)(p))
#define IS_NETMAP_DESC(d) ((d) && P2NMD(d)->self == P2NMD(d))
#define NETMAP_FD(d) (P2NMD(d)->fd)
@ -616,7 +616,7 @@ nm_parse(const char *ifname, struct nm_desc *d, char *err)
const char *vpname = NULL;
u_int namelen;
uint32_t nr_ringid = 0, nr_flags;
char errmsg[MAXERRMSG] = "";
char errmsg[MAXERRMSG] = "", *tmp;
long num;
uint16_t nr_arg2 = 0;
enum { P_START, P_RNGSFXOK, P_GETNUM, P_FLAGS, P_FLAGSOK, P_MEMID } p_state;
@ -713,12 +713,13 @@ nm_parse(const char *ifname, struct nm_desc *d, char *err)
port++;
break;
case P_GETNUM:
num = strtol(port, (char **)&port, 10);
num = strtol(port, &tmp, 10);
if (num < 0 || num >= NETMAP_RING_MASK) {
snprintf(errmsg, MAXERRMSG, "'%ld' out of range [0, %d)",
num, NETMAP_RING_MASK);
goto fail;
}
port = tmp;
nr_ringid = num & NETMAP_RING_MASK;
p_state = P_RNGSFXOK;
break;
@ -760,11 +761,12 @@ nm_parse(const char *ifname, struct nm_desc *d, char *err)
snprintf(errmsg, MAXERRMSG, "double setting of memid");
goto fail;
}
num = strtol(port, (char **)&port, 10);
num = strtol(port, &tmp, 10);
if (num <= 0) {
snprintf(errmsg, MAXERRMSG, "invalid memid %ld, must be >0", num);
goto fail;
}
port = tmp;
nr_arg2 = num;
p_state = P_RNGSFXOK;
break;
@ -1044,7 +1046,7 @@ nm_inject(struct nm_desc *d, const void *buf, size_t size)
ring->slot[i].flags = NS_MOREFRAG;
nm_pkt_copy(buf, NETMAP_BUF(ring, idx), ring->nr_buf_size);
i = nm_ring_next(ring, i);
buf = (char *)buf + ring->nr_buf_size;
buf = (const char *)buf + ring->nr_buf_size;
}
idx = ring->slot[i].buf_idx;
ring->slot[i].len = rem;