[Python-checkins] r86812 - in python/branches/release27-maint: Modules/posixmodule.c
stefan.krah
python-checkins at python.org
Fri Nov 26 18:35:50 CET 2010
Author: stefan.krah
Date: Fri Nov 26 18:35:50 2010
New Revision: 86812
Log:
Merged revisions 86808 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86808 | stefan.krah | 2010-11-26 17:16:47 +0100 (Fri, 26 Nov 2010) | 1 line
Further indentation cleanup.
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Modules/posixmodule.c
Modified: python/branches/release27-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/posixmodule.c (original)
+++ python/branches/release27-maint/Modules/posixmodule.c Fri Nov 26 18:35:50 2010
@@ -1852,7 +1852,7 @@
static PyObject *
posix_fsync(PyObject *self, PyObject *fdobj)
{
- return posix_fildes(fdobj, fsync);
+ return posix_fildes(fdobj, fsync);
}
#endif /* HAVE_FSYNC */
@@ -1870,7 +1870,7 @@
static PyObject *
posix_fdatasync(PyObject *self, PyObject *fdobj)
{
- return posix_fildes(fdobj, fdatasync);
+ return posix_fildes(fdobj, fdatasync);
}
#endif /* HAVE_FDATASYNC */
@@ -2812,7 +2812,7 @@
!SystemTimeToFileTime(&now, &atime)) {
win32_error("utime", NULL);
goto done;
- }
+ }
}
else if (!PyTuple_Check(arg) || PyTuple_Size(arg) != 2) {
PyErr_SetString(PyExc_TypeError,
@@ -3934,9 +3934,9 @@
for (i = 0; i < n; ++i) {
PyObject *o = PyInt_FromLong((long)alt_grouplist[i]);
if (o == NULL) {
- Py_DECREF(result);
- result = NULL;
- break;
+ Py_DECREF(result);
+ result = NULL;
+ break;
}
PyList_SET_ITEM(result, i, o);
}
@@ -7385,33 +7385,33 @@
size_t tablesize)
{
if (PyInt_Check(arg)) {
- *valuep = PyInt_AS_LONG(arg);
- return 1;
+ *valuep = PyInt_AS_LONG(arg);
+ return 1;
}
if (PyString_Check(arg)) {
- /* look up the value in the table using a binary search */
- size_t lo = 0;
+ /* look up the value in the table using a binary search */
+ size_t lo = 0;
size_t mid;
- size_t hi = tablesize;
- int cmp;
- char *confname = PyString_AS_STRING(arg);
- while (lo < hi) {
- mid = (lo + hi) / 2;
- cmp = strcmp(confname, table[mid].name);
- if (cmp < 0)
- hi = mid;
- else if (cmp > 0)
- lo = mid + 1;
- else {
- *valuep = table[mid].value;
- return 1;
+ size_t hi = tablesize;
+ int cmp;
+ char *confname = PyString_AS_STRING(arg);
+ while (lo < hi) {
+ mid = (lo + hi) / 2;
+ cmp = strcmp(confname, table[mid].name);
+ if (cmp < 0)
+ hi = mid;
+ else if (cmp > 0)
+ lo = mid + 1;
+ else {
+ *valuep = table[mid].value;
+ return 1;
+ }
}
- }
- PyErr_SetString(PyExc_ValueError, "unrecognized configuration name");
+ PyErr_SetString(PyExc_ValueError, "unrecognized configuration name");
}
else
- PyErr_SetString(PyExc_TypeError,
- "configuration names must be strings or integers");
+ PyErr_SetString(PyExc_TypeError,
+ "configuration names must be strings or integers");
return 0;
}
@@ -7494,14 +7494,14 @@
if (PyArg_ParseTuple(args, "iO&:fpathconf", &fd,
conv_path_confname, &name)) {
- long limit;
+ long limit;
- errno = 0;
- limit = fpathconf(fd, name);
- if (limit == -1 && errno != 0)
- posix_error();
- else
- result = PyInt_FromLong(limit);
+ errno = 0;
+ limit = fpathconf(fd, name);
+ if (limit == -1 && errno != 0)
+ posix_error();
+ else
+ result = PyInt_FromLong(limit);
}
return result;
}
@@ -8320,21 +8320,21 @@
sizeof(posix_constants_pathconf)
/ sizeof(struct constdef),
"pathconf_names", module))
- return -1;
+ return -1;
#endif
#ifdef HAVE_CONFSTR
if (setup_confname_table(posix_constants_confstr,
sizeof(posix_constants_confstr)
/ sizeof(struct constdef),
"confstr_names", module))
- return -1;
+ return -1;
#endif
#ifdef HAVE_SYSCONF
if (setup_confname_table(posix_constants_sysconf,
sizeof(posix_constants_sysconf)
/ sizeof(struct constdef),
"sysconf_names", module))
- return -1;
+ return -1;
#endif
return 0;
}
@@ -8445,10 +8445,10 @@
{
double loadavg[3];
if (getloadavg(loadavg, 3)!=3) {
- PyErr_SetString(PyExc_OSError, "Load averages are unobtainable");
- return NULL;
+ PyErr_SetString(PyExc_OSError, "Load averages are unobtainable");
+ return NULL;
} else
- return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]);
+ return Py_BuildValue("ddd", loadavg[0], loadavg[1], loadavg[2]);
}
#endif
More information about the Python-checkins
mailing list