Bug#345969: nepenthes on amd64 bug: casting void * to int32_t on amd64 looses precision

[Nepenthes Development Team]

Hi,

as you might guess, I don't run 64bit os myself, so I'm unable to test it.

The patch just replaces int32_t with int, I can't check it myself, but
i guess it *should* work, at least it should compile.
The other changes are part of getting the code compile on cygwin.

If this fixes the problems on amd64, please tell me, as I unable to
reproduce this problem myself.

Thanks

MfG
Markus Koetter

Index: nepenthes-core/src/Buffer.cpp
===================================================================
--- nepenthes-core/src/Buffer.cpp       (Revision 1927)
+++ nepenthes-core/src/Buffer.cpp       (Arbeitskopie)
@@ -149,7 +149,7 @@
                        resize(newSize);
                }
                
-               memcpy((void *)((int32_t)m_data + m_offset), data, size);
+               memcpy((void *)((int)m_data + m_offset), data, size);
        }
 
        m_offset += size;
@@ -180,7 +180,7 @@
        if( size > 0 )
        {
                //memcpy(m_data, (void *)((int32_t)m_data + size), m_offset - 
size);
-               memmove(m_data, (void *)((int32_t)m_data + size), m_offset - 
size);
+               memmove(m_data, (void *)((int)m_data + size), m_offset - size);
                m_offset -= size;
        }
 }
@@ -214,8 +214,8 @@
 void Buffer::debug()
 {
        printf("SB shellbuffer debug\n");
-       printf("  > m_data = 0x%08x\n", (int32_t)m_data);
-       printf("  > m_offset = %d\n", m_offset);
-       printf("  > m_allocSize = %d\n", m_allocSize);
+       printf("  > m_data = 0x%08x\n", (int)m_data);
+       printf("  > m_offset = %d\n", (int)m_offset);
+       printf("  > m_allocSize = %d\n", (int)m_allocSize);
 }