epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix Windows build - no math with void* pointers

Browse Source
This commit is contained in:
Andrew Johnson
2014-06-16 09:57:02 -05:00
parent f3ff337a41
commit 659916cb16
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ioc/db/dbConvert.c
+9 -8
View File
@@ -43,19 +43,20 @@
* nRequest, no_bytes, and offset should be given in bytes.
*/
static void copyNoConvert(const void *pfrom,
void *pto,
long nRequest,
long no_bytes,
long offset)
void *pto, long nRequest, long no_bytes, long offset)
{
if(offset>0 && offset < no_bytes && offset+nRequest > no_bytes) {
const void *pfrom_offset = (const char *) pfrom + offset;
if (offset > 0 && offset < no_bytes && offset + nRequest > no_bytes) {
const size_t N = no_bytes - offset;
void *pto_N = (char *) pto + N;
/* copy with wrap */
memmove(pto, pfrom + offset, N);
memmove(pto + N, pfrom, nRequest - N);
memmove(pto, pfrom_offset, N);
memmove(pto_N, pfrom, nRequest - N);
} else {
/* no wrap, just copy */
memmove(pto, pfrom + offset, nRequest);
memmove(pto, pfrom_offset, nRequest);
}
}
#define COPYNOCONVERT(N, FROM, TO, NREQ, NO_ELEM, OFFSET) \