[Python-3000-checkins] r64228 - in python/branches/py3k: Modules/_collectionsmodule.c Modules/_localemodule.c Modules/_tkinter.c Modules/arraymodule.c Modules/unicodedata_db.h Tools/unicode/makeunicodedata.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Jun 13 09:50:45 2008
New Revision: 64228

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/_collectionsmodule.c
   python/branches/py3k/Modules/_localemodule.c
   python/branches/py3k/Modules/_tkinter.c
   python/branches/py3k/Modules/arraymodule.c
   python/branches/py3k/Modules/unicodedata_db.h
   python/branches/py3k/Tools/unicode/makeunicodedata.py

Modified: python/branches/py3k/Modules/_collectionsmodule.c
==============================================================================
--- python/branches/py3k/Modules/_collectionsmodule.c	(original)
+++ python/branches/py3k/Modules/_collectionsmodule.c	Fri Jun 13 09:50:45 2008
@@ -85,7 +85,7 @@
 	return b;
 }
 
-void
+static void
 freeblock(block *b)
 {
 	if (numfreeblocks < MAXFREEBLOCKS) {
@@ -898,7 +898,7 @@
 	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 @@
  	{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 @@
 
 /*********************** Deque Reverse Iterator **************************/
 
-PyTypeObject dequereviter_type;
+static PyTypeObject dequereviter_type;
 
 static PyObject *
 deque_reviter(dequeobject *deque)
@@ -1047,7 +1047,7 @@
 	return item;
 }
 
-PyTypeObject dequereviter_type = {
+static PyTypeObject dequereviter_type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"deque_reverse_iterator",		/* tp_name */
 	sizeof(dequeiterobject),		/* tp_basicsize */

Modified: python/branches/py3k/Modules/_localemodule.c
==============================================================================
--- python/branches/py3k/Modules/_localemodule.c	(original)
+++ python/branches/py3k/Modules/_localemodule.c	Fri Jun 13 09:50:45 2008
@@ -387,7 +387,7 @@
 
 #ifdef HAVE_LANGINFO_H
 #define LANGINFO(X) {#X, X}
-struct langinfo_constant{
+static struct langinfo_constant{
 	char* name;
 	int value;
 } langinfo_constants[] = 

Modified: python/branches/py3k/Modules/_tkinter.c
==============================================================================
--- python/branches/py3k/Modules/_tkinter.c	(original)
+++ python/branches/py3k/Modules/_tkinter.c	Fri Jun 13 09:50:45 2008
@@ -488,7 +488,7 @@
    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 @@
 	return 0;
 }
 
-void
+static void
 var_perform(VarEvent *ev)
 {
 	*(ev->res) = ev->func(ev->self, ev->args, ev->flags);

Modified: python/branches/py3k/Modules/arraymodule.c
==============================================================================
--- python/branches/py3k/Modules/arraymodule.c	(original)
+++ python/branches/py3k/Modules/arraymodule.c	Fri Jun 13 09:50:45 2008
@@ -1493,7 +1493,7 @@
 	{NULL}
 };
 
-PyMethodDef array_methods[] = {
+static PyMethodDef array_methods[] = {
 	{"append",	(PyCFunction)array_append,	METH_O,
 	 append_doc},
 	{"buffer_info", (PyCFunction)array_buffer_info, METH_NOARGS,

Modified: python/branches/py3k/Modules/unicodedata_db.h
==============================================================================
--- python/branches/py3k/Modules/unicodedata_db.h	(original)
+++ python/branches/py3k/Modules/unicodedata_db.h	Fri Jun 13 09:50:45 2008
@@ -228,7 +228,7 @@
 #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 @@
   {0,0,0}
 };
 
-struct reindex nfc_last[] = {
+static struct reindex nfc_last[] = {
   { 768, 4, 0},
   { 774, 6, 5},
   { 783, 0, 12},

Modified: python/branches/py3k/Tools/unicode/makeunicodedata.py
==============================================================================
--- python/branches/py3k/Tools/unicode/makeunicodedata.py	(original)
+++ python/branches/py3k/Tools/unicode/makeunicodedata.py	Fri Jun 13 09:50:45 2008
@@ -234,12 +234,12 @@
     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)