From c466d85bba497e7113ed271568714b634ce3cd66 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Wed, 10 Apr 2013 18:45:51 +1000 Subject: [PATCH] pSock is obsolete, see conman.h SConnection struct. --- protocol.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/protocol.c b/protocol.c index 083fb9bd..c85f7138 100644 --- a/protocol.c +++ b/protocol.c @@ -489,13 +489,7 @@ int SCWriteSycamore(SConnection * pCon, char *pBuffer, int iOut) return 0; } - /* log it for any case */ - if (pCon->pSock) { - iRet = pCon->pSock->sockid; - } else { - iRet = 0; - } - snprintf(pBueffel,sizeof(pBueffel)-1, "Next line intended for socket: %d", iRet); + snprintf(pBueffel,sizeof(pBueffel)-1, "Next line intended for socket: %d", pCon->sockHandle); SICSLogWrite(pBueffel, eInternal); SICSLogWrite(pBuffer, iOut); @@ -689,14 +683,8 @@ int SCWriteJSON_String(SConnection * pCon, char *pBuffer, int iOut) if (strlen(pBuffer) == 0) return 1; - /* log it for any case */ - if (pCon->pSock) { - iRet = pCon->pSock->sockid; - } else { - iRet = 0; - } if (pCon->iMacro != 1) { - snprintf(pBueffel,sizeof(pBueffel)-1, "Next line intended for socket: %d", iRet); + snprintf(pBueffel,sizeof(pBueffel)-1, "Next line intended for socket: %d", pCon->sockHandle); SICSLogWrite(pBueffel, eInternal); SICSLogWrite(pBuffer, iOut); }