Changeset 388 for python/vendor/current/Modules/spwdmodule.c

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Modules/spwdmodule.c (modified) (8 diffs)

python/vendor/current/Modules/spwdmodule.c

@@ -28 +28 @@
 
 static PyStructSequence_Field struct_spwd_type_fields[] = {
-        {"sp_nam", "login name"},
-        {"sp_pwd", "encrypted password"},
-        {"sp_lstchg", "date of last change"},
-        {"sp_min", "min #days between changes"}, 
-        {"sp_max", "max #days between changes"}, 
-        {"sp_warn", "#days before pw expires to warn user about it"}, 
-        {"sp_inact", "#days after pw expires until account is blocked"},
-        {"sp_expire", "#days since 1970-01-01 until account is disabled"},
-        {"sp_flag", "reserved"},
-        {0}
+    {"sp_nam", "login name"},
+    {"sp_pwd", "encrypted password"},
+    {"sp_lstchg", "date of last change"},
+    {"sp_min", "min #days between changes"},
+    {"sp_max", "max #days between changes"},
+    {"sp_warn", "#days before pw expires to warn user about it"},
+    {"sp_inact", "#days after pw expires until account is blocked"},
+    {"sp_expire", "#days since 1970-01-01 until account is disabled"},
+    {"sp_flag", "reserved"},
+    {0}
 };
 
@@ -47 +47 @@
 
 static PyStructSequence_Desc struct_spwd_type_desc = {
-        "spwd.struct_spwd",
-        struct_spwd__doc__,
-        struct_spwd_type_fields,
-        9,
+    "spwd.struct_spwd",
+    struct_spwd__doc__,
+    struct_spwd_type_fields,
+    9,
 };
 
@@ -61 +61 @@
 {
   if (val)
-          PyStructSequence_SET_ITEM(v, i, PyString_FromString(val));
+      PyStructSequence_SET_ITEM(v, i, PyString_FromString(val));
   else {
-          PyStructSequence_SET_ITEM(v, i, Py_None);
-          Py_INCREF(Py_None);
+      PyStructSequence_SET_ITEM(v, i, Py_None);
+      Py_INCREF(Py_None);
   }
 }
@@ -70 +70 @@
 static PyObject *mkspent(struct spwd *p)
 {
-        int setIndex = 0;
-        PyObject *v = PyStructSequence_New(&StructSpwdType);
-        if (v == NULL)
-                return NULL;
+    int setIndex = 0;
+    PyObject *v = PyStructSequence_New(&StructSpwdType);
+    if (v == NULL)
+        return NULL;
 
 #define SETI(i,val) PyStructSequence_SET_ITEM(v, i, PyInt_FromLong((long) val))
 #define SETS(i,val) sets(v, i, val)
 
-        SETS(setIndex++, p->sp_namp);
-        SETS(setIndex++, p->sp_pwdp);
-        SETI(setIndex++, p->sp_lstchg);
-        SETI(setIndex++, p->sp_min);
-        SETI(setIndex++, p->sp_max);
-        SETI(setIndex++, p->sp_warn);
-        SETI(setIndex++, p->sp_inact);
-        SETI(setIndex++, p->sp_expire);
-        SETI(setIndex++, p->sp_flag);
+    SETS(setIndex++, p->sp_namp);
+    SETS(setIndex++, p->sp_pwdp);
+    SETI(setIndex++, p->sp_lstchg);
+    SETI(setIndex++, p->sp_min);
+    SETI(setIndex++, p->sp_max);
+    SETI(setIndex++, p->sp_warn);
+    SETI(setIndex++, p->sp_inact);
+    SETI(setIndex++, p->sp_expire);
+    SETI(setIndex++, p->sp_flag);
 
 #undef SETS
 #undef SETI
 
-        if (PyErr_Occurred()) {
-                Py_DECREF(v);
-                return NULL;
-        }
+    if (PyErr_Occurred()) {
+        Py_DECREF(v);
+        return NULL;
+    }
 
-        return v;
+    return v;
 }
 
@@ -112 +112 @@
 static PyObject* spwd_getspnam(PyObject *self, PyObject *args)
 {
-        char *name;
-        struct spwd *p;
-        if (!PyArg_ParseTuple(args, "s:getspnam", &name))
-                return NULL;
-        if ((p = getspnam(name)) == NULL) {
-                PyErr_SetString(PyExc_KeyError, "getspnam(): name not found");
-                return NULL;
-        }
-        return mkspent(p);
+    char *name;
+    struct spwd *p;
+    if (!PyArg_ParseTuple(args, "s:getspnam", &name))
+        return NULL;
+    if ((p = getspnam(name)) == NULL) {
+        PyErr_SetString(PyExc_KeyError, "getspnam(): name not found");
+        return NULL;
+    }
+    return mkspent(p);
 }
 
@@ -136 +136 @@
 spwd_getspall(PyObject *self, PyObject *args)
 {
-        PyObject *d;
-        struct spwd *p;
-        if ((d = PyList_New(0)) == NULL)
-                return NULL;
-        setspent();
-        while ((p = getspent()) != NULL) {
-                PyObject *v = mkspent(p);
-                if (v == NULL || PyList_Append(d, v) != 0) {
-                        Py_XDECREF(v);
-                        Py_DECREF(d);
-                        endspent();
-                        return NULL;
-                }
-                Py_DECREF(v);
-        }
-        endspent();
-        return d;
+    PyObject *d;
+    struct spwd *p;
+    if ((d = PyList_New(0)) == NULL)
+        return NULL;
+    setspent();
+    while ((p = getspent()) != NULL) {
+        PyObject *v = mkspent(p);
+        if (v == NULL || PyList_Append(d, v) != 0) {
+            Py_XDECREF(v);
+            Py_DECREF(d);
+            endspent();
+            return NULL;
+        }
+        Py_DECREF(v);
+    }
+    endspent();
+    return d;
 }
 
@@ -158 +158 @@
 
 static PyMethodDef spwd_methods[] = {
-#ifdef HAVE_GETSPNAM    
-        {"getspnam",    spwd_getspnam, METH_VARARGS, spwd_getspnam__doc__},
+#ifdef HAVE_GETSPNAM
+    {"getspnam",        spwd_getspnam, METH_VARARGS, spwd_getspnam__doc__},
 #endif
 #ifdef HAVE_GETSPENT
-        {"getspall",    spwd_getspall, METH_NOARGS, spwd_getspall__doc__},
+    {"getspall",        spwd_getspall, METH_NOARGS, spwd_getspall__doc__},
 #endif
-        {NULL,          NULL}           /* sentinel */
+    {NULL,              NULL}           /* sentinel */
 };
 
@@ -171 +171 @@
 initspwd(void)
 {
-        PyObject *m;
-        m=Py_InitModule3("spwd", spwd_methods, spwd__doc__);
-        if (m == NULL)
-                return;
-        if (!initialized)
-                PyStructSequence_InitType(&StructSpwdType, 
-                                          &struct_spwd_type_desc);
-        Py_INCREF((PyObject *) &StructSpwdType);
-        PyModule_AddObject(m, "struct_spwd", (PyObject *) &StructSpwdType);
-        initialized = 1;
+    PyObject *m;
+    m=Py_InitModule3("spwd", spwd_methods, spwd__doc__);
+    if (m == NULL)
+        return;
+    if (!initialized)
+        PyStructSequence_InitType(&StructSpwdType,
+                                  &struct_spwd_type_desc);
+    Py_INCREF((PyObject *) &StructSpwdType);
+    PyModule_AddObject(m, "struct_spwd", (PyObject *) &StructSpwdType);
+    initialized = 1;
 }