Changeset 6036:3068a825a29e in roaraudio
- Timestamp:
- 10/10/14 11:22:47 (9 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/ctl.c
r5961 r6036 86 86 int roar_get_standby (struct roar_connection * con) { 87 87 struct roar_message mes; 88 uint16_t * d16 = (uint16_t *)mes.data; 88 89 89 90 memset(&mes, 0, sizeof(struct roar_message)); // make valgrind happy! … … 99 100 return -1; 100 101 101 return ROAR_NET2HOST16(* ((uint16_t*)mes.data));102 return ROAR_NET2HOST16(*d16); 102 103 } 103 104 104 105 int roar_set_standby (struct roar_connection * con, int state) { 105 106 struct roar_message mes; 107 uint16_t * d16 = (uint16_t *)mes.data; 106 108 107 109 memset(&mes, 0, sizeof(struct roar_message)); // make valgrind happy! … … 111 113 mes.datalen = 2; 112 114 113 * ((uint16_t*)mes.data)= ROAR_HOST2NET16((unsigned) state);115 *d16 = ROAR_HOST2NET16((unsigned) state); 114 116 115 117 if ( roar_req(con, &mes, NULL) == -1 ) -
libroar/socket.c
r6025 r6036 292 292 struct cmsghdr * cmptr = (struct cmsghdr *) cmptr_buf; 293 293 char localmes[1] = {0}; 294 int * fhptr; 294 295 295 296 ROAR_DBG("roar_socket_send_fh(sock=%i, fh=%i, mes=%p, len=%u) = ?", sock, fh, mes, len); … … 318 319 msg.msg_control = (caddr_t) cmptr; 319 320 msg.msg_controllen = _SCMR_CONTROLLEN; 320 *(int *)CMSG_DATA(cmptr) = fh; 321 fhptr = (int *)CMSG_DATA(cmptr); 322 *fhptr = fh; 321 323 322 324 return sendmsg(sock, &msg, 0); … … 335 337 char localmes[1]; 336 338 size_t locallen[1] = {1}; 339 int * fhptr; 337 340 338 341 ROAR_DBG("roar_socket_recv_fh(sock=%i, mes=%p, len=%p) = ?", sock, mes, len); … … 369 372 } 370 373 371 ROAR_DBG("roar_socket_recv_fh(sock=%i, mes=%p, len=%p) = %i", sock, mes, len, *(int *)CMSG_DATA(cmptr)); 372 return *(int *)CMSG_DATA(cmptr); 374 fhptr = (int *)CMSG_DATA(cmptr); 375 ROAR_DBG("roar_socket_recv_fh(sock=%i, mes=%p, len=%p) = %i", sock, mes, len, *fhptr); 376 return *fhptr; 373 377 #else 374 378 ROAR_ERR("roar_socket_recv_fh(*): There is no UNIX Domain Socket support in win32, download a real OS."); … … 533 537 #define _NEED_OBJ 534 538 char * dnet_node_buf; 539 char * del; 535 540 #endif 536 541 #ifdef _NEED_OBJ 537 542 char obj[80]; 538 char * del;539 543 #endif 540 544 #ifdef ROAR_HAVE_GETADDRINFO -
libroar/vio_stream.c
r6028 r6036 164 164 int port = 0; 165 165 char file[80] = ""; 166 static int count = 0;167 166 char socketaddr[80]; 168 167 ssize_t socketaddr_len = -1; … … 171 170 #endif 172 171 #ifdef ROAR_HAVE_LIBDNET 172 static int count = 0; 173 173 struct dn_naddr *binaddr; 174 174 #endif
Note: See TracChangeset
for help on using the changeset viewer.