diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
commit | 882fd010527b8d8823f09e19edbed3746265fa08 (patch) | |
tree | be5c7cace6697afc753c152d13ad5145d0884a42 /backend/dell1600n_net.c | |
parent | 527bedac30eb120915718eb7997e6dacd583512e (diff) | |
parent | e0d94cf4d39395df1e2c6bb4d967200298c13881 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/dell1600n_net.c')
-rw-r--r-- | backend/dell1600n_net.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/dell1600n_net.c b/backend/dell1600n_net.c index 41be589..9f2d48d 100644 --- a/backend/dell1600n_net.c +++ b/backend/dell1600n_net.c @@ -946,7 +946,7 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize) { if (!(i % 16)) - sprintf (lineBuf, "%p: ", (buf + i)); + sprintf (lineBuf, "%p: ", (void *) &buf[i]); sprintf (itemBuf, "%02x ", (const unsigned int) buf[i]); @@ -1199,7 +1199,7 @@ ProcessFindResponse (unsigned char *pData, size_t size) DBG (10, "ProcessFindResponse: processing %lu bytes, pData=%p\n", - (unsigned long)size, pData); + (unsigned long) size, (void *) pData); /* check we have a complete packet */ if (!MessageIsComplete (pData, size)) @@ -1355,7 +1355,7 @@ ProcessUdpResponse (unsigned char *pData, size_t size, HexDump (15, pData, size); DBG (10, "ProcessUdpResponse: processing %lu bytes, pData=%p\n", - (unsigned long)size, pData); + (unsigned long) size, (void *) pData); /* check we have a complete packet */ if (!MessageIsComplete (pData, size)) @@ -1486,7 +1486,7 @@ ProcessTcpResponse (struct ScannerState *pState, struct ComBuf *pTcpBuf) int bProcessImage = 0; DBG (10, "ProcessTcpResponse: processing %lu bytes, pData=%p\n", - (unsigned long)pTcpBuf->m_used, pData); + (unsigned long) pTcpBuf->m_used, (void *) pData); HexDump (15, pData, pTcpBuf->m_used); /* if message not complete then wait for more to arrive */ @@ -1799,7 +1799,7 @@ ProcessPageData (struct ScannerState *pState) struct PageInfo pageInfo; JSAMPLE *pJpegLine = NULL; - uint32 *pTiffRgba = NULL; + uint32_t *pTiffRgba = NULL; unsigned char *pOut; char tiffErrBuf[1024]; |