diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | emu/FreeBSD/ipif.c | 4 | ||||
| -rw-r--r-- | emu/NetBSD/ipif.c | 4 | ||||
| -rw-r--r-- | emu/Nt/ipif.c | 4 | ||||
| -rw-r--r-- | emu/OpenBSD/ipif.c | 4 | ||||
| -rw-r--r-- | emu/port/ipif-posix.c | 4 | ||||
| -rw-r--r-- | utils/acid/rdebug.c | 2 |
7 files changed, 13 insertions, 11 deletions
@@ -1,3 +1,5 @@ +20090719 + correct order of operands to memset(!), eg in ipif [mjl] 20090718 fix appl/cmd/stream.b error exits to include fail: [mjl] 20090717 diff --git a/emu/FreeBSD/ipif.c b/emu/FreeBSD/ipif.c index 853e2e93..04d5bbbd 100644 --- a/emu/FreeBSD/ipif.c +++ b/emu/FreeBSD/ipif.c @@ -54,7 +54,7 @@ so_send(int sock, void *va, int len, void *hdr, int hdrlen) if(hdr == 0) r = write(sock, va, len); else { - memset(&sa, sizeof(sa), 0); + memset(&sa, 0, sizeof(sa)); sin = (struct sockaddr_in*)&sa; sin->sin_family = AF_INET; switch(hdrlen){ @@ -94,7 +94,7 @@ so_recv(int sock, void *va, int len, void *hdr, int hdrlen) l = sizeof(sa); r = recvfrom(sock, va, len, 0, &sa, &l); if(r >= 0) { - memset(h, sizeof h, 0); + memset(h, 0, sizeof(h)); switch(hdrlen){ case OUdphdrlenv4: memmove(h, &sin->sin_addr, 4); diff --git a/emu/NetBSD/ipif.c b/emu/NetBSD/ipif.c index 853e2e93..04d5bbbd 100644 --- a/emu/NetBSD/ipif.c +++ b/emu/NetBSD/ipif.c @@ -54,7 +54,7 @@ so_send(int sock, void *va, int len, void *hdr, int hdrlen) if(hdr == 0) r = write(sock, va, len); else { - memset(&sa, sizeof(sa), 0); + memset(&sa, 0, sizeof(sa)); sin = (struct sockaddr_in*)&sa; sin->sin_family = AF_INET; switch(hdrlen){ @@ -94,7 +94,7 @@ so_recv(int sock, void *va, int len, void *hdr, int hdrlen) l = sizeof(sa); r = recvfrom(sock, va, len, 0, &sa, &l); if(r >= 0) { - memset(h, sizeof h, 0); + memset(h, 0, sizeof(h)); switch(hdrlen){ case OUdphdrlenv4: memmove(h, &sin->sin_addr, 4); diff --git a/emu/Nt/ipif.c b/emu/Nt/ipif.c index 4a4e8a12..048ce542 100644 --- a/emu/Nt/ipif.c +++ b/emu/Nt/ipif.c @@ -52,7 +52,7 @@ so_send(int sock, void *va, int len, void *hdr, int hdrlen) if(hdr == 0) r = send(sock, va, len, 0); else { - memset(&sa, sizeof(sa), 0); + memset(&sa, 0, sizeof(sa)); sin = (struct sockaddr_in*)&sa; sin->sin_family = AF_INET; switch(hdrlen){ @@ -127,7 +127,7 @@ so_recv(int sock, void *va, int len, void *hdr, int hdrlen) l = sizeof(sa); r = recvfrom(sock, va, len, 0, &sa, &l); if(r >= 0) { - memset(h, sizeof h, 0); + memset(h, 0, sizeof(h)); switch(hdrlen){ case OUdphdrlenv4: memmove(h, &sin->sin_addr, 4); diff --git a/emu/OpenBSD/ipif.c b/emu/OpenBSD/ipif.c index 853e2e93..04d5bbbd 100644 --- a/emu/OpenBSD/ipif.c +++ b/emu/OpenBSD/ipif.c @@ -54,7 +54,7 @@ so_send(int sock, void *va, int len, void *hdr, int hdrlen) if(hdr == 0) r = write(sock, va, len); else { - memset(&sa, sizeof(sa), 0); + memset(&sa, 0, sizeof(sa)); sin = (struct sockaddr_in*)&sa; sin->sin_family = AF_INET; switch(hdrlen){ @@ -94,7 +94,7 @@ so_recv(int sock, void *va, int len, void *hdr, int hdrlen) l = sizeof(sa); r = recvfrom(sock, va, len, 0, &sa, &l); if(r >= 0) { - memset(h, sizeof h, 0); + memset(h, 0, sizeof(h)); switch(hdrlen){ case OUdphdrlenv4: memmove(h, &sin->sin_addr, 4); diff --git a/emu/port/ipif-posix.c b/emu/port/ipif-posix.c index fffc4e7c..589d455a 100644 --- a/emu/port/ipif-posix.c +++ b/emu/port/ipif-posix.c @@ -63,7 +63,7 @@ so_send(int sock, void *va, int len, void *hdr, int hdrlen) if(hdr == 0) r = write(sock, va, len); else { - memset(&sa, sizeof(sa), 0); + memset(&sa, 0, sizeof(sa)); sin = (struct sockaddr_in*)&sa; sin->sin_family = AF_INET; switch(hdrlen){ @@ -103,7 +103,7 @@ so_recv(int sock, void *va, int len, void *hdr, int hdrlen) l = sizeof(sa); r = recvfrom(sock, va, len, 0, &sa, &l); if(r >= 0) { - memset(h, sizeof h, 0); + memset(h, 0, sizeof(h)); switch(hdrlen){ case OUdphdrlenv4: memmove(h, &sin->sin_addr, 4); diff --git a/utils/acid/rdebug.c b/utils/acid/rdebug.c index 8903711e..6a321346 100644 --- a/utils/acid/rdebug.c +++ b/utils/acid/rdebug.c @@ -71,7 +71,7 @@ remoteio(int pid, char *file, char *buf, int nb) if(protodebug) fprint(2, "remoteio %d: %s\n", pid, file); - memset(buf, nb, 0); + memset(buf, 0, nb); if(strcmp(file, "proc") == 0) tag = Tproc; else if(strcmp(file, "status") == 0) |