diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:32:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:32:58 +0200 |
| commit | 16e3921905bb0b3f48b0b387e750d0f40439d634 (patch) | |
| tree | c14bcb440f4cd0efffe34d7cc9edbe9bae138d74 | |
| parent | d4690ae053b1b26fd215485f08875d508d7c4eba (diff) | |
| parent | d36407c7947ba119c971427e1528122509bf895f (diff) | |
| download | rsyslog-16e3921905bb0b3f48b0b387e750d0f40439d634.tar.gz rsyslog-16e3921905bb0b3f48b0b387e750d0f40439d634.tar.xz rsyslog-16e3921905bb0b3f48b0b387e750d0f40439d634.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
runtime/nsdpoll_ptcp.c
| -rw-r--r-- | plugins/imudp/imudp.c | 4 | ||||
| -rw-r--r-- | runtime/nsdpoll_ptcp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index 8ab3b9be..92fe61da 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -578,7 +578,7 @@ rsRetVal rcvMainLoop(thrdInfo_t *pThrd) for(lstn = lcnfRoot ; lstn != NULL ; lstn = lstn->next) { if(lstn->sock != -1) { udpEPollEvt[i].events = EPOLLIN | EPOLLET; - udpEPollEvt[i].data.u64 = (long long unsigned) lstn; + udpEPollEvt[i].data.ptr = lstn; if(epoll_ctl(efd, EPOLL_CTL_ADD, lstn->sock, &(udpEPollEvt[i])) < 0) { rs_strerror_r(errno, errStr, sizeof(errStr)); errmsg.LogError(errno, NO_ERRCODE, "epoll_ctrl failed on fd %d with %s\n", @@ -597,7 +597,7 @@ rsRetVal rcvMainLoop(thrdInfo_t *pThrd) break; /* terminate input! */ for(i = 0 ; i < nfds ; ++i) { - processSocket(pThrd, (struct lstn_s*)currEvt[i].data.u64, &frominetPrev, &bIsPermitted); + processSocket(pThrd, currEvt[i].data.ptr, &frominetPrev, &bIsPermitted); } } diff --git a/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c index 8c90d7fd..e69c0fbb 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -76,7 +76,7 @@ addEvent(nsdpoll_ptcp_t *pThis, int id, void *pUsr, int mode, nsd_ptcp_t *pSock, pNew->event.events |= EPOLLIN; if(mode & NSDPOLL_OUT) pNew->event.events |= EPOLLOUT; - pNew->event.data.u64 = (uint64) pNew; + pNew->event.data.ptr = pNew; pthread_mutex_lock(&pThis->mutEvtLst); pNew->pNext = pThis->pRoot; pThis->pRoot = pNew; @@ -254,7 +254,7 @@ Wait(nsdpoll_t *pNsdpoll, int timeout, int *numEntries, nsd_epworkset_t workset[ /* we got valid events, so tell the caller... */ dbgprintf("epoll returned %d entries\n", nfds); for(i = 0 ; i < nfds ; ++i) { - pOurEvt = (nsdpoll_epollevt_lst_t*) event[i].data.u64; + pOurEvt = (nsdpoll_epollevt_lst_t*) event[i].data.ptr; workset[i].id = pOurEvt->id; workset[i].pUsr = pOurEvt->pUsr; dbgprintf("epoll push ppusr[%d]: %p\n", i, pOurEvt->pUsr); |