From: Raymond Hettinger Date: Wed, 17 Aug 2005 02:19:36 +0000 (+0000) Subject: Fix nits. X-Git-Tag: v2.5a0~1511 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f81e45023e114dded93cb1745c01552d8309c39f;p=python Fix nits. --- diff --git a/Objects/dictobject.c b/Objects/dictobject.c index aaca5aa4c1..e90aca4b0f 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -113,7 +113,7 @@ equally good collision statistics, needed less code & used less memory. */ /* Object used as dummy key to fill deleted entries */ -static PyObject *dummy; /* Initialized by first call to newdictobject() */ +static PyObject *dummy = NULL; /* Initialized by first call to newdictobject() */ /* forward declarations */ static dictentry * @@ -567,7 +567,7 @@ PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value) */ if (!(mp->ma_used > n_used && mp->ma_fill*3 >= (mp->ma_mask+1)*2)) return 0; - return dictresize(mp, mp->ma_used*(mp->ma_used>50000 ? 2 : 4)); + return dictresize(mp, (mp->ma_used>50000 ? mp->ma_used*2 : mp->ma_used*4)); } int