[Python-Dev] Did I miss the decision to untabify all of the C code?

[Victor Stinner]

Le jeudi 06 mai 2010 02:59:26, Eric Smith a écrit :
> I grant you that it's a largely a mechanized change (except for the "a
> posteriori manual intervention" part), but still.

Attached patches are the "manual interventation" parts. 99% of the whole patch 
only changes the indentation. There is just *two* changes not related directly 
to indentation:
 - I moved rc and buffer variable (specific to OS/2) at the beginning of the 
function to avoid { and }.
 - I added a newline in "static PyObject * os2_error(int code)"

The manual editions is mostly to "fix" the indentation.


Diff on Python trunk (diff -uw):
---------------------------
--- Modules/posixmodule.c.r80843        2010-05-06 10:18:47.000000000 +0200
+++ Modules/posixmodule.c       2010-05-06 10:18:51.000000000 +0200
@@ -470,6 +470,10 @@
 {
        PyObject *d;
        char **e;
+#if defined(PYOS_OS2)
+    APIRET rc;
+    char   buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars */
+#endif
        d = PyDict_New();
        if (d == NULL)
                return NULL;
@@ -505,10 +509,6 @@
                Py_DECREF(v);
        }
 #if defined(PYOS_OS2)
-    {
-        APIRET rc;
-        char   buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars 
*/
-
         rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH);
        if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') 
*/
             PyObject *v = PyString_FromString(buffer);
@@ -521,7 +521,6 @@
                    PyDict_SetItemString(d, "ENDLIBPATH", v);
             Py_DECREF(v);
         }
-    }
 #endif
        return d;
 }
@@ -662,7 +661,8 @@
    errors are not in a global variable e.g. 'errno' nor are
    they congruent with posix error numbers. */
 
-static PyObject * os2_error(int code)
+static PyObject *
+os2_error(int code)
 {
     char text[1024];
     PyObject *v;
---------------------------


Diff on Python py3k (diff -uw):
---------------------------
--- Modules/posixmodule.c.r80845	2010-05-06 10:36:27.000000000 +0200
+++ Modules/posixmodule.c	2010-05-06 10:36:32.000000000 +0200
@@ -445,6 +445,11 @@
 #else
 	char **e;
 #endif
+#if defined(PYOS_OS2)
+    APIRET rc;
+    char   buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars */
+#endif
+
 	d = PyDict_New();
 	if (d == NULL)
 		return NULL;
@@ -515,10 +520,6 @@
 	}
 #endif
 #if defined(PYOS_OS2)
-    {
-        APIRET rc;
-        char   buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars 
*/
-
         rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH);
 	if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') */
             PyObject *v = PyBytes_FromString(buffer);
@@ -531,7 +532,6 @@
 	    PyDict_SetItemString(d, "ENDLIBPATH", v);
             Py_DECREF(v);
         }
-    }
 #endif
 	return d;
 }
@@ -672,7 +672,8 @@
    errors are not in a global variable e.g. 'errno' nor are
    they congruent with posix error numbers. */
 
-static PyObject * os2_error(int code)
+static PyObject *
+os2_error(int code)
 {
     char text[1024];
     PyObject *v;

---------------------------

-- 
Victor Stinner
http://www.haypocalc.com/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: posix_tabify_manual-trunk.patch
Type: text/x-patch
Size: 22334 bytes
Desc: not available
URL: <http://mail.python.org/pipermail/python-dev/attachments/20100506/12dd661d/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: posix_untabify_manual-py3k.patch
Type: text/x-patch
Size: 18448 bytes
Desc: not available
URL: <http://mail.python.org/pipermail/python-dev/attachments/20100506/12dd661d/attachment-0003.bin>