Received patch

Hi!

I'll just post this here for review, if noone objects, I'll apply (see
also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=134414).

diff -Nurd zinf-2.2.4-3/base/src/player.cpp zinf-2.2.4-3.1/base/src/player.cpp
--- zinf-2.2.4-3/base/src/player.cpp	2003-08-08 14:31:03.000000000 +0200
+++ zinf-2.2.4-3.1/base/src/player.cpp	2003-08-08 14:31:18.000000000 +0200
@@ -870,6 +870,7 @@
 
 
          cerr << "No UI plugin in '" << thePath << "' matched 'plugins/" << name << "' or 'plugins/" << name << ".ui.'" << endl;
+	 cerr << "If this was the first time you started zinf just try again." << endl;
          cerr << The_BRANDING << " will quit." << endl;
 #endif
          Event    *e = new Event(CMD_QuitPlayer);
diff -Nurd zinf-2.2.4-3/io/src/pullbuffer.cpp zinf-2.2.4-3.1/io/src/pullbuffer.cpp
--- zinf-2.2.4-3/io/src/pullbuffer.cpp	2003-03-15 02:01:51.000000000 +0100
+++ zinf-2.2.4-3.1/io/src/pullbuffer.cpp	2003-08-08 14:31:18.000000000 +0200
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <stdint.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
@@ -168,7 +169,7 @@
 
    pPtr = (char *)pBuffer;
 
-   if (pPtr >= (char *)((unsigned int)m_pPullBuffer + m_iBufferSize))
+   if (pPtr >= (char *)((uintptr_t)m_pPullBuffer + m_iBufferSize))
 	   pPtr -= m_iBufferSize;
 
    pBuffer = (void *)pPtr;
diff -Nurd zinf-2.2.4-3/lib/utf8/utf8.c zinf-2.2.4-3.1/lib/utf8/utf8.c
--- zinf-2.2.4-3/lib/utf8/utf8.c	2003-01-01 00:27:47.000000000 +0100
+++ zinf-2.2.4-3.1/lib/utf8/utf8.c	2003-08-08 14:31:18.000000000 +0200
@@ -24,6 +24,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */
+#include "charset.h"
+#endif
 #include "utf8.h"
 
 
diff -Nurd zinf-2.2.4-3/ui/zinf/src/ThemeZip.cpp zinf-2.2.4-3.1/ui/zinf/src/ThemeZip.cpp
--- zinf-2.2.4-3/ui/zinf/src/ThemeZip.cpp	2003-02-23 01:35:06.000000000 +0100
+++ zinf-2.2.4-3.1/ui/zinf/src/ThemeZip.cpp	2003-08-08 14:31:18.000000000 +0200
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <stdint.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -145,7 +146,7 @@
        oFile = *(*i);
        pPtr = strrchr(oFile.c_str(), DIR_MARKER);
        if (pPtr)
-           oFile.erase(0, ((int)pPtr - (int)oFile.c_str()) + 1);
+           oFile.erase(0, ((uintptr_t)pPtr - (uintptr_t)oFile.c_str()) + 1);
 
        pIn = fopen((*i)->c_str(), "rb");
        if (pIn == NULL)
@@ -424,7 +425,7 @@
 
        oUnpackFile = string(TarRecord.header.name);
        // in case we have sub-directory in tar, take only filename
-       unsigned int uPos;
+       uintptr_t uPos;
        uPos=oUnpackFile.rfind('/');
        if(uPos!=oUnpackFile.npos) oUnpackFile.erase(0,uPos+1);
 
@@ -553,7 +554,7 @@
         // see if it is directory record we are looking for
         if(TarRecord.header.typeflag == DIRTYPE)
         {
-            unsigned int uPos;
+            uintptr_t uPos;
             oDescriptiveName = string (TarRecord.header.name);
 
             // erase trailing slash

-- 
Andreas Rottmann         | Rotty@ICQ      | 118634484@ICQ | [email protected]
http://www.8ung.at/rotty | GnuPG Key: http://www.8ung.at/rotty/gpg.asc
Fingerprint              | DFB4 4EB4 78A4 5EEE 6219  F228 F92F CFC5 01FD 5B62

Python is executable pseudocode, Perl is executable line-noise.


-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01