gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-03 01:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix bad return value for NSMutableSet-classForCoder

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30878 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-06-28 14:35:44 +00:00
parent 3096e38f6a
commit 26f5110852
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,9 +1,17 @@
<<<<<<< .mine
2010-06-28 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSSet.m: Fix incorrect return value in NSMutableSet's
-classForCoder method.
=======
2010-06-28 Quentin Mathe <quentin.mathe@gmail.com> 2010-06-28 Quentin Mathe <quentin.mathe@gmail.com>
* Tools/autogsdoc.m: Improved to search for .m files among the * Tools/autogsdoc.m: Improved to search for .m files among the
command-line arguments in addition to the current directory and command-line arguments in addition to the current directory and
documentation directory. documentation directory.
>>>>>>> .r30877
2010-06-26 Richard Frith-Macdonald <rfm@gnu.org> 2010-06-26 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSObject.m: Remove the Object(NSObjectCompat) category as the * Source/NSObject.m: Remove the Object(NSObjectCompat) category as the

2
Source/NSSet.m
View file

@ -946,7 +946,7 @@ static Class NSMutableSet_concrete_class;
- (Class) classForCoder - (Class) classForCoder
{ {
return NSMutableSet_concrete_class; return NSMutableSet_abstract_class;
} }
/** <init /> <override-subclass /> /** <init /> <override-subclass />

6
Tools/gdomap.c
View file

@ -3960,7 +3960,7 @@ nameServer(const char* name, const char* host, int op, int ptype, struct sockadd
*/ */
if (host && host[0] == '*' && host[1] == '\0') if (host && host[0] == '*' && host[1] == '\0')
{ {
multi = 1; multi = 1;
} }
/* /*
* If no host name is given, we use the name of the local host. * If no host name is given, we use the name of the local host.
@ -4073,10 +4073,10 @@ nameServer(const char* name, const char* host, int op, int ptype, struct sockadd
if (op == GDO_REGISTER) if (op == GDO_REGISTER)
{ {
port = (unsigned short)pnum; port = (unsigned short)pnum;
if (port == 0) if (port == 0 || htons(port) == p)
{ {
snprintf(ebuf, sizeof(ebuf), snprintf(ebuf, sizeof(ebuf),
"attempted registration with bad port."); "attempted registration with bad port (%d).", port);
gdomap_log(LOG_ERR); gdomap_log(LOG_ERR);
return -1; return -1;
} }