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.
........

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

diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index 50c72c9f6610e6732dca551b18b0ea0d51e6d86e..37b7ec180b83e23e04e24d4bb87dab84c3a3cc37 100644 (file)
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -387,7 +387,7 @@ PyLocale_getdefaultlocale(PyObject* self)
 
 #ifdef HAVE_LANGINFO_H
 #define LANGINFO(X) {#X, X}
-struct langinfo_constant{
+static struct langinfo_constant{
        char* name;
        int value;
 } langinfo_constants[] = 

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

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 5fa525f7c1986ce19894c472809d4a27c79eef1b..da2e9c2ceb90d93f4b4e8d8a6c1d90b58b12d991 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1493,7 +1493,7 @@ static PyGetSetDef array_getsets [] = {
        {NULL}
 };
 
-PyMethodDef array_methods[] = {
+static PyMethodDef array_methods[] = {
        {"append",      (PyCFunction)array_append,      METH_O,
         append_doc},
        {"buffer_info", (PyCFunction)array_buffer_info, METH_NOARGS,

diff --git a/Modules/unicodedata_db.h b/Modules/unicodedata_db.h
index d68466a4808f04cea0be5ac78f5453d2e7b36cc2..f56e44639a3d627a75a37cc39619db04e8977a97 100644 (file)
--- a/Modules/unicodedata_db.h
+++ b/Modules/unicodedata_db.h
@@ -228,7 +228,7 @@ const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = {
 #define TOTAL_FIRST 356
 #define TOTAL_LAST 53
 struct reindex{int start;short count,index;};
-struct reindex nfc_first[] = {
+static struct reindex nfc_first[] = {
   { 60, 2, 0},
   { 65, 15, 3},
   { 82, 8, 19},
@@ -425,7 +425,7 @@ struct reindex nfc_first[] = {
   {0,0,0}
 };
 
-struct reindex nfc_last[] = {
+static struct reindex nfc_last[] = {
   { 768, 4, 0},
   { 774, 6, 5},
   { 783, 0, 12},

diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py
index 7b82f5c83c81ee2d0deb12ff12e1fc2dbcec4022..52839e6f26df5de4ccde7bd67bb239f9e873ceee 100644 (file)
--- a/Tools/unicode/makeunicodedata.py
+++ b/Tools/unicode/makeunicodedata.py
@@ -234,12 +234,12 @@ def makeunicodedata(unicode, trace):
     print("#define TOTAL_FIRST",total_first, file=fp)
     print("#define TOTAL_LAST",total_last, 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:
         print("  { %d, %d, %d}," % (start,end-start,comp_first[start]), file=fp)
     print("  {0,0,0}", 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:
         print("  { %d, %d, %d}," % (start,end-start,comp_last[start]), file=fp)
     print("  {0,0,0}", file=fp)