Call me anal, but there was a particular phrase that was speading to

comments everywhere that bugged me: /* Foo is inlined */ instead of
/* Inline Foo */.  Somehow the "is inlined" phrase always confused me
for half a second (thinking, "No it isn't" until I added the missing
"here").  The new phrase is hopefully unambiguous.

diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
index 690f56b70203287cc5e9ccbe75700ac79669783d..c0e3c80da49b368dbaaf2e984cb9415f27ae2826 100644 (file)
--- a/Objects/bufferobject.c
+++ b/Objects/bufferobject.c
@@ -138,7 +138,7 @@ PyBuffer_New(int size)
                                "size must be zero or positive");
                return NULL;
        }
-       /* PyObject_New is inlined */
+       /* Inline PyObject_New */
        o = PyObject_MALLOC(sizeof(*b) + size);
        if ( o == NULL )
                return PyErr_NoMemory();

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index ba1e3cc5663c30d7c8394700b1db3f09d607536e..bb2835420a2ecf7133ac2b07bac93a131beb508f 100644 (file)
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -199,7 +199,7 @@ PyComplex_FromCComplex(Py_complex cval)
 {
        register PyComplexObject *op;
 
-       /* PyObject_New is inlined */
+       /* Inline PyObject_New */
        op = (PyComplexObject *) PyObject_MALLOC(sizeof(PyComplexObject));
        if (op == NULL)
                return PyErr_NoMemory();

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 2787a0a7d4f51b9f630eee6cb4c8e458e7ed09f7..36e861e0a9e52b9dc8f4f0b612200388e84cb43b 100644 (file)
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -64,7 +64,7 @@ PyFloat_FromDouble(double fval)
                if ((free_list = fill_free_list()) == NULL)
                        return NULL;
        }
-       /* PyObject_New is inlined */
+       /* Inline PyObject_New */
        op = free_list;
        free_list = (PyFloatObject *)op->ob_type;
        PyObject_INIT(op, &PyFloat_Type);

diff --git a/Objects/intobject.c b/Objects/intobject.c
index 2cda031d2e153cb83b2d07a025a93f8c108e7af8..1b852c23f15749d8b06e33fef5749f3fc6c043f2 100644 (file)
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -113,7 +113,7 @@ PyInt_FromLong(long ival)
                if ((free_list = fill_free_list()) == NULL)
                        return NULL;
        }
-       /* PyObject_New is inlined */
+       /* Inline PyObject_New */
        v = free_list;
        free_list = (PyIntObject *)v->ob_type;
        PyObject_INIT(v, &PyInt_Type);

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 2626d3c891775d47435608eb059dad8e6af07bb1..7d3881e6a020f941ad8754754232689a2780776b 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -62,7 +62,7 @@ PyString_FromStringAndSize(const char *str, int size)
                return (PyObject *)op;
        }
 
-       /* PyObject_NewVar is inlined */
+       /* Inline PyObject_NewVar */
        op = (PyStringObject *)
                PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
        if (op == NULL)
@@ -118,7 +118,7 @@ PyString_FromString(const char *str)
                return (PyObject *)op;
        }
 
-       /* PyObject_NewVar is inlined */
+       /* Inline PyObject_NewVar */
        op = (PyStringObject *)
                PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
        if (op == NULL)
@@ -878,7 +878,7 @@ string_concat(register PyStringObject *a, register PyObject *bb)
                return (PyObject *)a;
        }
        size = a->ob_size + b->ob_size;
-       /* PyObject_NewVar is inlined */
+       /* Inline PyObject_NewVar */
        op = (PyStringObject *)
                PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
        if (op == NULL)

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 678aeb12502310ee7310708fa09fa084b1073cc9..4c52de3aa4dd97c9551b3a75b47056459c57dcbb 100644 (file)
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -48,7 +48,7 @@ PyTuple_New(register int size)
 #ifdef COUNT_ALLOCS
                fast_tuple_allocs++;
 #endif
-               /* PyObject_InitVar is inlined */
+               /* Inline PyObject_InitVar */
 #ifdef Py_TRACE_REFS
                op->ob_size = size;
                op->ob_type = &PyTuple_Type;

diff --git a/PC/_winreg.c b/PC/_winreg.c
index 06488029d7072347c219541976ac9cc28497e73f..07190ec5ecbd032c0973a8395994d3a5fb28a0f3 100644 (file)
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -606,7 +606,7 @@ PyHKEY_FromHKEY(HKEY h)
 {
        PyHKEYObject *op;
 
-       /* PyObject_New is inlined */
+       /* Inline PyObject_New */
        op = (PyHKEYObject *) PyObject_MALLOC(sizeof(PyHKEYObject));
        if (op == NULL)
                return PyErr_NoMemory();