Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 80844-80845 via svnmerge from 

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

........
  r80844 | victor.stinner | 2010-05-06 01:33:33 +0200 (jeu., 06 mai 2010) | 5 lines

  Untabify Modules/posixmodule.c

  Run Antoine Pitrou "untabify" script + manual editions (OS/2 and some
  continuation lines).
........
  r80845 | victor.stinner | 2010-05-06 02:03:44 +0200 (jeu., 06 mai 2010) | 4 lines

  Untabify Modules/posixmodule.c (2)

  Fix some more functions by hand
........
This commit is contained in:
Victor Stinner 2010-05-06 00:20:44 +00:00
parent 130e0b5fc1
commit 43cdd0ad34
1 changed files with 4787 additions and 4787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/posixmodule.c
View File

@ -376,6 +376,10 @@ convertenviron(void)
{ {
PyObject *d; PyObject *d;
char **e; char **e;
#if defined(PYOS_OS2)
APIRET rc;
char buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars */
#endif
d = PyDict_New(); d = PyDict_New();
if (d == NULL) if (d == NULL)
return NULL; return NULL;
@ -411,10 +415,6 @@ convertenviron(void)
Py_DECREF(v); Py_DECREF(v);
} }
#if defined(PYOS_OS2) #if defined(PYOS_OS2)
{
APIRET rc;
char buffer[1024]; /* OS/2 Provides a Documented Max of 1024 Chars */
rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH); rc = DosQueryExtLIBPATH(buffer, BEGIN_LIBPATH);
if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') */ if (rc == NO_ERROR) { /* (not a type, envname is NOT 'BEGIN_LIBPATH') */
PyObject *v = PyString_FromString(buffer); PyObject *v = PyString_FromString(buffer);
@ -427,7 +427,6 @@ convertenviron(void)
PyDict_SetItemString(d, "ENDLIBPATH", v); PyDict_SetItemString(d, "ENDLIBPATH", v);
Py_DECREF(v); Py_DECREF(v);
} }
}
#endif #endif
return d; return d;
} }
@ -575,7 +574,8 @@ os2_strerror(char *msgbuf, int msgbuflen, int errorcode, char *reason)
errors are not in a global variable e.g. 'errno' nor are errors are not in a global variable e.g. 'errno' nor are
they congruent with posix error numbers. */ they congruent with posix error numbers. */
static PyObject * os2_error(int code) static PyObject *
os2_error(int code)
{ {
char text[1024]; char text[1024];
PyObject *v; PyObject *v;