[Libreoffice-commits] .: soltools/ldump

[Tor Lillqvist]

 soltools/ldump/ldump.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a1ba722b20aafb0a4b156d6a241e2a6845620b64
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jan 22 03:13:16 2011 +0200

    Don't strip _ prefixes for x64 Windows

diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx
index 31b516d..c7ecb75 100644
--- a/soltools/ldump/ldump.cxx
+++ b/soltools/ldump/ldump.cxx
@@ -211,8 +211,10 @@ bool LibDump::Dump()
             //fprintf( stderr, "Gefundenen Prefix : %s %d \n", aTmpBuf, nPreLen );
             // den ersten _ raus
             nLen = (int) strlen(aName);
+#ifndef _WIN64
             if (aName[0] == '_')
                 strcpy( aBuf , &aName[1] );
+#endif
             strncpy ( aTmpBuf, aBuf, (size_t) nPreLen );
             aTmpBuf[nPreLen] = '\0';
             if ( !strcmp( aTmpBuf, cAPrefix ))
@@ -220,13 +222,13 @@ bool LibDump::Dump()
                 if ( bLdump3 ) {
                     int nChar = '@';
                     char *pNeu = strchr( aBuf, nChar );
-                    int nPos = pNeu - aBuf + 1;
+                    size_t nPos = pNeu - aBuf + 1;
                     if ( nPos > 0 )
                     {
                         char aOldBuf[MAX_MAN];
                         strcpy( aOldBuf, aBuf );
                         char pChar[MAX_MAN];
-                        strncpy( pChar, aBuf, (size_t) (nPos -1) );
+                        strncpy( pChar, aBuf, nPos - 1 );
                         pChar[nPos-1] = '\0';
                         strcpy( aBuf, pChar );
                         strcat( aBuf, "=" );