Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/mac/files: mac-3.99.4.5-gcc44.patch
Date: Tue, 06 Oct 2009 14:13:20
Message-Id: E1MvAmz-0006U1-SM@stork.gentoo.org
1 ssuominen 09/10/06 14:13:17
2
3 Added: mac-3.99.4.5-gcc44.patch
4 Log:
5 Initial commit wrt #94477, thanks to Thomas Kuther and others.
6 (Portage version: 2.2_rc43/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-sound/mac/files/mac-3.99.4.5-gcc44.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mac/files/mac-3.99.4.5-gcc44.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mac/files/mac-3.99.4.5-gcc44.patch?rev=1.1&content-type=text/plain
13
14 Index: mac-3.99.4.5-gcc44.patch
15 ===================================================================
16 diff -ur mac-3.99-u4-b5.orig/src/MACLib/APELink.cpp mac-3.99-u4-b5/src/MACLib/APELink.cpp
17 --- mac-3.99-u4-b5.orig/src/MACLib/APELink.cpp 2006-06-01 12:00:57.000000000 +0300
18 +++ mac-3.99-u4-b5/src/MACLib/APELink.cpp 2009-10-06 16:53:19.000000000 +0300
19 @@ -63,10 +63,10 @@
20 if (pData != NULL)
21 {
22 // parse out the information
23 - char * pHeader = strstr(pData, APE_LINK_HEADER);
24 - char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
25 - char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
26 - char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
27 + const char * pHeader = strstr(pData, APE_LINK_HEADER);
28 + const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
29 + const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
30 + const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
31
32 if (pHeader && pImageFile && pStartBlock && pFinishBlock)
33 {
34 @@ -81,7 +81,7 @@
35
36 // get the path
37 char cImageFile[MAX_PATH + 1]; int nIndex = 0;
38 - char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
39 + const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
40 while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
41 cImageFile[nIndex++] = *pImageCharacter++;
42 cImageFile[nIndex] = 0;