diff options
| author | mux <mux@FreeBSD.org> | 2005-04-26 14:25:11 +0000 |
|---|---|---|
| committer | mux <mux@FreeBSD.org> | 2005-04-26 14:25:11 +0000 |
| commit | 97a7651af8ad42b6f47e50ff43d50319422a7a8e (patch) | |
| tree | 4eba5fe9fa741c6c667fce6686078caaf3bf686d | |
| parent | 5e7fbbbdc299d1d4b4b81375f830eee4a057c7ff (diff) | |
| download | FreeBSD-src-97a7651af8ad42b6f47e50ff43d50319422a7a8e.zip FreeBSD-src-97a7651af8ad42b6f47e50ff43d50319422a7a8e.tar.gz | |
Make this compile with GCC4 by fixing a few signedness related warnings.
Reviewed by: md5(1)
| -rw-r--r-- | lib/libnetgraph/debug.c | 2 | ||||
| -rw-r--r-- | lib/libnetgraph/msg.c | 9 | ||||
| -rw-r--r-- | lib/libnetgraph/sock.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c index 696d7d9..73d614d 100644 --- a/lib/libnetgraph/debug.c +++ b/lib/libnetgraph/debug.c @@ -243,7 +243,7 @@ fail: fail2: NGLOGX(" cmd %d", msg->header.cmd); NGLOGX(" args (%d bytes)", msg->header.arglen); - _NgDebugBytes(msg->data, msg->header.arglen); + _NgDebugBytes((u_char *)msg->data, msg->header.arglen); done: if (csock != -1) diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c index 2c5953d..cca9573 100644 --- a/lib/libnetgraph/msg.c +++ b/lib/libnetgraph/msg.c @@ -76,7 +76,7 @@ NgSendMsg(int cs, const char *path, msg.header.token = gMsgId; msg.header.flags = NGF_ORIG; msg.header.cmd = cmd; - snprintf(msg.header.cmdstr, NG_CMDSTRSIZ, "cmd%d", cmd); + snprintf((char *)msg.header.cmdstr, NG_CMDSTRSIZ, "cmd%d", cmd); /* Deliver message */ if (NgDeliverMsg(cs, path, &msg, args, arglen) < 0) @@ -122,7 +122,8 @@ NgSendAsciiMsg(int cs, const char *path, const char *fmt, ...) memset(ascii, 0, sizeof(*ascii)); /* Build inner header (only need cmdstr, arglen, and data fields) */ - strncpy(ascii->header.cmdstr, cmd, sizeof(ascii->header.cmdstr) - 1); + strncpy((char *)ascii->header.cmdstr, cmd, + sizeof(ascii->header.cmdstr) - 1); strcpy(ascii->data, args); ascii->header.arglen = strlen(ascii->data) + 1; free(buf); @@ -249,8 +250,8 @@ NgRecvMsg(int cs, struct ng_mesg *rep, size_t replen, char *path) { u_char sgbuf[NG_PATHSIZ + NGSA_OVERHEAD]; struct sockaddr_ng *const sg = (struct sockaddr_ng *) sgbuf; - int len, sglen = sizeof(sgbuf); - int errnosv; + socklen_t sglen = sizeof(sgbuf); + int len, errnosv; /* Read reply */ len = recvfrom(cs, rep, replen, 0, (struct sockaddr *) sg, &sglen); diff --git a/lib/libnetgraph/sock.c b/lib/libnetgraph/sock.c index 1aeafcc..395f28b 100644 --- a/lib/libnetgraph/sock.c +++ b/lib/libnetgraph/sock.c @@ -213,7 +213,7 @@ NgRecvData(int ds, u_char * buf, size_t len, char *hook) { u_char frombuf[NG_HOOKSIZ + NGSA_OVERHEAD]; struct sockaddr_ng *const from = (struct sockaddr_ng *) frombuf; - int fromlen = sizeof(frombuf); + socklen_t fromlen = sizeof(frombuf); int rtn, errnosv; /* Read packet */ |
