ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-26 13:59:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fix to WHY_perror() macro

Browse Source
This commit is contained in:
Andrew Bettison 2012-05-08 17:48:16 +09:30
parent da9fe6fdca
commit 68cfa6218c
2 changed files with 4 additions and 8 deletions

10
overlay_mdp.c

@ -162,10 +162,8 @@ int overlay_mdp_reply(int sock,struct sockaddr_un *recvaddr,int recvaddrlen,
int r=sendto(sock,(char *)mdpreply,replylen,0,
(struct sockaddr *)recvaddr,recvaddrlen);
if (r<replylen) {
WHY("sendto() failed when sending MDP reply");
WHY_perror("sendto(d)");
printf("sock=%d, r=%d\n",sock,r);
return -1;
return WHYF("sendto() failed when sending MDP reply, sock=%d, r=%d", sock, r);
} else
if (0) WHYF("reply of %d bytes sent",r);
return 0;
@ -1101,8 +1099,7 @@ int overlay_mdp_send(overlay_mdp_frame *mdp,int flags,int timeout_ms)
mdp->packetTypeAndFlags=MDP_ERROR;
mdp->error.error=1;
snprintf(mdp->error.message,128,"Error sending frame to MDP server.");
WHY_perror("sendto(f)");
return -1;
return WHY_perror("sendto(f)");
} else {
if (!(flags&MDP_AWAITREPLY)) {
return 0;
@ -1172,9 +1169,8 @@ int overlay_mdp_client_init()
int len = 1 + strlen(name.sun_path) + sizeof(name.sun_family) + 1;
int r=bind(mdp_client_socket, (struct sockaddr *)&name, len);
if (r) {
WHY("Could not bind MDP client socket to file name");
WHY_perror("bind");
return -1;
return WHY("Could not bind MDP client socket to file name");
}
int send_buffer_size=128*1024;

2
serval.h

@ -739,7 +739,7 @@ int setReason(char *fmt, ...);
#define WHY(X) setReason("%s:%d:%s() %s",__FILE__,__LINE__,__FUNCTION__,X)
#define WHYRETNULL(X) { setReason("%s:%d:%s() %s",__FILE__,__LINE__,__FUNCTION__,X); return NULL; }
#define WHYF(F, ...) setReason("%s:%d:%s() " F, __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)
#define WHY_perror(X) setReason("%s:%d:%s() %s: %s [errno=%d]" X, __FILE__, __LINE__, __FUNCTION__, X, strerror(errno), errno)
#define WHY_perror(X) setReason("%s:%d:%s() %s: %s [errno=%d]", __FILE__, __LINE__, __FUNCTION__, X, strerror(errno), errno)
overlay_buffer *ob_new(int size);
int ob_free(overlay_buffer *b);