gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Recommit NSUnarchiver.m (now tested), revert recently broken NSPropertyList.m to working version again.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32081 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-02-11 15:43:43 +00:00
parent 703e5bf39a
commit 37a1ef47bb
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2011-02-11 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLocale.m: Recommit
* Source/NSUnarchiver.m: Recommit
I have now test these two and recommited them as working.
* Source/NSPropertyList.m: Revert
These was quietly modified/broken since my last commit ...
reverting to the previous tested/working version.
2011-02-11 Richard Frith-Macdonald <rfm@gnu.org> 2011-02-11 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSArray.m: Recommit fixed version * Source/NSArray.m: Recommit fixed version

4
Source/NSPropertyList.m
View file

@ -2159,9 +2159,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
{ {
stride = stride * STRIDE_FACTOR + 1; stride = stride * STRIDE_FACTOR + 1;
} }
lastClass = object_getClass(keys[d + stride]); lastClass = 0;
comp = (NSComparisonResult (*)(id, SEL, id))
[keys[d + stride] methodForSelector: @selector(compare:)];
while (stride > (STRIDE_FACTOR - 1)) while (stride > (STRIDE_FACTOR - 1))
{ {
// loop to sort for each value of stride // loop to sort for each value of stride

1
Source/NSUnarchiver.m
View file

@ -1196,7 +1196,6 @@ static Class NSDataMallocClass;
{ {
NSLog(@"Loss of information converting decoded value to uint16_t"); NSLog(@"Loss of information converting decoded value to uint16_t");
} }
*(uint8_t*)address = (uint8_t)big;
*(uint16_t*)address = (uint16_t)big; *(uint16_t*)address = (uint16_t)big;
return; return;
case 4: case 4: