summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-06-28 16:26:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-06-28 16:26:13 (GMT)
commit2e5820b804fe9a3f192d6a018b5ee655f792f5fb (patch)
tree099da6b5e213fe2a68709b26e1a165cff233d257
parent5111127f455d952750f1146cbea14bbe1ca25394 (diff)
downloadcpython-2e5820b804fe9a3f192d6a018b5ee655f792f5fb.zip
cpython-2e5820b804fe9a3f192d6a018b5ee655f792f5fb.tar.gz
cpython-2e5820b804fe9a3f192d6a018b5ee655f792f5fb.tar.bz2
Merged revisions 73618 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r73618 | benjamin.peterson | 2009-06-28 11:23:55 -0500 (Sun, 28 Jun 2009) | 1 line fix useless comparison #6355 ........
-rw-r--r--Objects/capsule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/capsule.c b/Objects/capsule.c
index 5304ce1..3d2d626 100644
--- a/Objects/capsule.c
+++ b/Objects/capsule.c
@@ -33,7 +33,7 @@ name_matches(const char *name1, const char *name2) {
/* if either is NULL, */
if (!name1 || !name2) {
/* they're only the same if they're both NULL. */
- return name2 == name2;
+ return name1 == name2;
}
return !strcmp(name1, name2);
}