talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this compile with GCC4 by fixing a few signedness related warnings. 

Reviewed by:	md5(1)
This commit is contained in:
Maxime Henrion 2005-04-26 14:25:11 +00:00
parent 4ef63bad69
commit b92367948a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libnetgraph/debug.c
View File

@ -243,7 +243,7 @@ fail:
fail2: fail2:
NGLOGX(" cmd %d", msg->header.cmd); NGLOGX(" cmd %d", msg->header.cmd);
NGLOGX(" args (%d bytes)", msg->header.arglen); NGLOGX(" args (%d bytes)", msg->header.arglen);
_NgDebugBytes(msg->data, msg->header.arglen); _NgDebugBytes((u_char *)msg->data, msg->header.arglen);
done: done:
if (csock != -1) if (csock != -1)

9
lib/libnetgraph/msg.c
View File

@ -76,7 +76,7 @@ NgSendMsg(int cs, const char *path,
msg.header.token = gMsgId; msg.header.token = gMsgId;
msg.header.flags = NGF_ORIG; msg.header.flags = NGF_ORIG;
msg.header.cmd = cmd; 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 */ /* Deliver message */
if (NgDeliverMsg(cs, path, &msg, args, arglen) < 0) 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)); memset(ascii, 0, sizeof(*ascii));
/* Build inner header (only need cmdstr, arglen, and data fields) */ /* 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); strcpy(ascii->data, args);
ascii->header.arglen = strlen(ascii->data) + 1; ascii->header.arglen = strlen(ascii->data) + 1;
free(buf); 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]; u_char sgbuf[NG_PATHSIZ + NGSA_OVERHEAD];
struct sockaddr_ng *const sg = (struct sockaddr_ng *) sgbuf; struct sockaddr_ng *const sg = (struct sockaddr_ng *) sgbuf;
int len, sglen = sizeof(sgbuf); socklen_t sglen = sizeof(sgbuf);
int errnosv; int len, errnosv;
/* Read reply */ /* Read reply */
len = recvfrom(cs, rep, replen, 0, (struct sockaddr *) sg, &sglen); len = recvfrom(cs, rep, replen, 0, (struct sockaddr *) sg, &sglen);

2
lib/libnetgraph/sock.c
View File

@ -213,7 +213,7 @@ NgRecvData(int ds, u_char * buf, size_t len, char *hook)
{ {
u_char frombuf[NG_HOOKSIZ + NGSA_OVERHEAD]; u_char frombuf[NG_HOOKSIZ + NGSA_OVERHEAD];
struct sockaddr_ng *const from = (struct sockaddr_ng *) frombuf; struct sockaddr_ng *const from = (struct sockaddr_ng *) frombuf;
int fromlen = sizeof(frombuf); socklen_t fromlen = sizeof(frombuf);
int rtn, errnosv; int rtn, errnosv;
/* Read packet */ /* Read packet */