From 37a1ef47bbd790cd5bef9eaec0b0333679e5b0e9 Mon Sep 17 00:00:00 2001 From: rfm Date: Fri, 11 Feb 2011 15:43:43 +0000 Subject: [PATCH] Recommit NSUnarchiver.m (now tested), revert recently broken NSPropertyList.m to working version again. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32081 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 9 +++++++++ Source/NSPropertyList.m | 4 +--- Source/NSUnarchiver.m | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63be6151f..c400ed288 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-02-11 Richard Frith-Macdonald + + * 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 * Source/NSArray.m: Recommit fixed version diff --git a/Source/NSPropertyList.m b/Source/NSPropertyList.m index 91d7ab74c..05d13f0f7 100644 --- a/Source/NSPropertyList.m +++ b/Source/NSPropertyList.m @@ -2159,9 +2159,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step, { stride = stride * STRIDE_FACTOR + 1; } - lastClass = object_getClass(keys[d + stride]); - comp = (NSComparisonResult (*)(id, SEL, id)) - [keys[d + stride] methodForSelector: @selector(compare:)]; + lastClass = 0; while (stride > (STRIDE_FACTOR - 1)) { // loop to sort for each value of stride diff --git a/Source/NSUnarchiver.m b/Source/NSUnarchiver.m index 1cf9bfa54..091923fe6 100644 --- a/Source/NSUnarchiver.m +++ b/Source/NSUnarchiver.m @@ -1196,7 +1196,6 @@ static Class NSDataMallocClass; { NSLog(@"Loss of information converting decoded value to uint16_t"); } - *(uint8_t*)address = (uint8_t)big; *(uint16_t*)address = (uint16_t)big; return; case 4: