diff --git a/ChangeLog b/ChangeLog index c59a1acec..fa124de7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2018-01-27 Richard Frith-Macdonald +2018-02-05 Richard Frith-Macdonald + + * Source/NSPortCoder.m: Remove redundant (always true) conditional. + +2018-02-04 Richard Frith-Macdonald * Source/GSFileHandle.m: keep checker happy by usingn return value of setsockopt. @@ -9,7 +13,7 @@ * Source/NSRunLoop.m: suppress warning using cast. * Source/NSTimeZone.m: check that time zone hour is in range 0 to 23 -2018-01-26 Richard Frith-Macdonald +2018-02-03 Richard Frith-Macdonald * Source/GSFTPURLHandle.m: change memcpy to memmove to avoid possible problems with overlapping source and destination areas. diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m index a112344b4..423ef4501 100644 --- a/Source/NSPortCoder.m +++ b/Source/NSPortCoder.m @@ -529,12 +529,9 @@ static unsigned encodingVersion; (*_dTagImp)(_src, dTagSel, &ainfo, 0, &_cursor); if (info != (ainfo & _GSC_MASK)) { - if (info != _GSC_ID || (ainfo & _GSC_MASK) != _GSC_CID) - { - [NSException raise: NSInternalInconsistencyException - format: @"expected %s and got %s", - typeToName2(info), typeToName2(ainfo)]; - } + [NSException raise: NSInternalInconsistencyException + format: @"expected %s and got %s", + typeToName2(info), typeToName2(ainfo)]; } for (i = 0; i < count; i++)