#include <stdlib.h>
#include <assert.h>
#include <stdint.h>
+#include <stdio.h>
#include <catta/log.h>
{
static char buf[256];
+ int err = WSAGetLastError();
+ int len = snprintf(buf, sizeof(buf), "[%i] ", err);
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, WSAGetLastError(), 0, buf, sizeof(buf), NULL);
+ NULL, err, 0, buf + len, sizeof(buf) - len, NULL);
return buf;
}
msg->msg_flags = (int)wsamsg.dwFlags;
// all flags that fit into dwFlags also fit into msg_flags (see above)
- // XXX debug, remove
- {
- char where[64];
- getnameinfo(msg->msg_name, msg->msg_namelen, where, sizeof(where), NULL, 0, NI_NUMERICHOST);
- catta_log_debug("recvmsg: %u bytes from %s", (unsigned int)bytesrcvd, where);
- }
return bytesrcvd;
}
return -1;
}
- // XXX debug, remove
- {
- char where[64];
- getnameinfo(msg->msg_name, msg->msg_namelen, where, sizeof(where), NULL, 0, NI_NUMERICHOST);
- catta_log_debug("sendmsg: %u bytes to %s", (unsigned int)bytessent, where);
- }
return bytessent;
}
int pipe(int pipefd[2])
{
- int lsock = INVALID_SOCKET;
+ int lsock = (int)INVALID_SOCKET;
struct sockaddr_in laddr;
socklen_t laddrlen = sizeof(laddr);
- pipefd[0] = pipefd[1] = INVALID_SOCKET;
+ pipefd[0] = pipefd[1] = (int)INVALID_SOCKET;
// bind a listening socket to a TCP port on localhost
laddr.sin_family = AF_INET;
strncpy(buf->version, "unknown", sizeof(buf->sysname)-1); // we don't need it
// computer (node) name
- if(GetComputerName(buf->nodename, sizeof(buf->nodename)-1) == 0) {
+ DWORD nodename_size = sizeof(buf->nodename)-1;
+ if(GetComputerName(buf->nodename, &nodename_size) == 0) {
errno = EFAULT;
return -1;
}