Merged revisions 64226 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64226 | martin.v.loewis | 2008-06-13 09:47:47 +0200 (Fr, 13 Jun 2008) | 2 lines

  Make more symbols static.
........
This commit is contained in:
Martin v. Löwis 2008-06-13 07:50:45 +00:00
parent 1c95155bd1
commit 59683e8529
6 changed files with 13 additions and 13 deletions

View File

@ -85,7 +85,7 @@ newblock(block *leftlink, block *rightlink, int len) {
return b; return b;
} }
void static void
freeblock(block *b) freeblock(block *b)
{ {
if (numfreeblocks < MAXFREEBLOCKS) { if (numfreeblocks < MAXFREEBLOCKS) {
@ -898,7 +898,7 @@ typedef struct {
int counter; /* number of items remaining for iteration */ int counter; /* number of items remaining for iteration */
} dequeiterobject; } dequeiterobject;
PyTypeObject dequeiter_type; static PyTypeObject dequeiter_type;
static PyObject * static PyObject *
deque_iter(dequeobject *deque) deque_iter(dequeobject *deque)
@ -965,7 +965,7 @@ static PyMethodDef dequeiter_methods[] = {
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
PyTypeObject dequeiter_type = { static PyTypeObject dequeiter_type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"deque_iterator", /* tp_name */ "deque_iterator", /* tp_name */
sizeof(dequeiterobject), /* tp_basicsize */ sizeof(dequeiterobject), /* tp_basicsize */
@ -1000,7 +1000,7 @@ PyTypeObject dequeiter_type = {
/*********************** Deque Reverse Iterator **************************/ /*********************** Deque Reverse Iterator **************************/
PyTypeObject dequereviter_type; static PyTypeObject dequereviter_type;
static PyObject * static PyObject *
deque_reviter(dequeobject *deque) deque_reviter(dequeobject *deque)
@ -1047,7 +1047,7 @@ dequereviter_next(dequeiterobject *it)
return item; return item;
} }
PyTypeObject dequereviter_type = { static PyTypeObject dequereviter_type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"deque_reverse_iterator", /* tp_name */ "deque_reverse_iterator", /* tp_name */
sizeof(dequeiterobject), /* tp_basicsize */ sizeof(dequeiterobject), /* tp_basicsize */

View File

@ -387,7 +387,7 @@ PyLocale_getdefaultlocale(PyObject* self)
#ifdef HAVE_LANGINFO_H #ifdef HAVE_LANGINFO_H
#define LANGINFO(X) {#X, X} #define LANGINFO(X) {#X, X}
struct langinfo_constant{ static struct langinfo_constant{
char* name; char* name;
int value; int value;
} langinfo_constants[] = } langinfo_constants[] =

View File

@ -488,7 +488,7 @@ Split(char *list)
lists. SplitObj walks through a nested tuple, finding string objects that lists. SplitObj walks through a nested tuple, finding string objects that
need to be split. */ need to be split. */
PyObject * static PyObject *
SplitObj(PyObject *arg) SplitObj(PyObject *arg)
{ {
if (PyTuple_Check(arg)) { if (PyTuple_Check(arg)) {
@ -1435,7 +1435,7 @@ varname_converter(PyObject *in, void *_out)
return 0; return 0;
} }
void static void
var_perform(VarEvent *ev) var_perform(VarEvent *ev)
{ {
*(ev->res) = ev->func(ev->self, ev->args, ev->flags); *(ev->res) = ev->func(ev->self, ev->args, ev->flags);

View File

@ -1493,7 +1493,7 @@ static PyGetSetDef array_getsets [] = {
{NULL} {NULL}
}; };
PyMethodDef array_methods[] = { static PyMethodDef array_methods[] = {
{"append", (PyCFunction)array_append, METH_O, {"append", (PyCFunction)array_append, METH_O,
append_doc}, append_doc},
{"buffer_info", (PyCFunction)array_buffer_info, METH_NOARGS, {"buffer_info", (PyCFunction)array_buffer_info, METH_NOARGS,

View File

@ -228,7 +228,7 @@ const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = {
#define TOTAL_FIRST 356 #define TOTAL_FIRST 356
#define TOTAL_LAST 53 #define TOTAL_LAST 53
struct reindex{int start;short count,index;}; struct reindex{int start;short count,index;};
struct reindex nfc_first[] = { static struct reindex nfc_first[] = {
{ 60, 2, 0}, { 60, 2, 0},
{ 65, 15, 3}, { 65, 15, 3},
{ 82, 8, 19}, { 82, 8, 19},
@ -425,7 +425,7 @@ struct reindex nfc_first[] = {
{0,0,0} {0,0,0}
}; };
struct reindex nfc_last[] = { static struct reindex nfc_last[] = {
{ 768, 4, 0}, { 768, 4, 0},
{ 774, 6, 5}, { 774, 6, 5},
{ 783, 0, 12}, { 783, 0, 12},

View File

@ -234,12 +234,12 @@ def makeunicodedata(unicode, trace):
print("#define TOTAL_FIRST",total_first, file=fp) print("#define TOTAL_FIRST",total_first, file=fp)
print("#define TOTAL_LAST",total_last, file=fp) print("#define TOTAL_LAST",total_last, file=fp)
print("struct reindex{int start;short count,index;};", file=fp) print("struct reindex{int start;short count,index;};", file=fp)
print("struct reindex nfc_first[] = {", file=fp) print("static struct reindex nfc_first[] = {", file=fp)
for start,end in comp_first_ranges: for start,end in comp_first_ranges:
print(" { %d, %d, %d}," % (start,end-start,comp_first[start]), file=fp) print(" { %d, %d, %d}," % (start,end-start,comp_first[start]), file=fp)
print(" {0,0,0}", file=fp) print(" {0,0,0}", file=fp)
print("};\n", file=fp) print("};\n", file=fp)
print("struct reindex nfc_last[] = {", file=fp) print("static struct reindex nfc_last[] = {", file=fp)
for start,end in comp_last_ranges: for start,end in comp_last_ranges:
print(" { %d, %d, %d}," % (start,end-start,comp_last[start]), file=fp) print(" { %d, %d, %d}," % (start,end-start,comp_last[start]), file=fp)
print(" {0,0,0}", file=fp) print(" {0,0,0}", file=fp)