Changeset 391 for python/trunk/Python/dynload_os2.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Python/dynload_os2.c (modified) (1 diff)

python/trunk/Python/dynload_os2.c

@@ -11 +11 @@
 
 const struct filedescr _PyImport_DynLoadFiletab[] = {
-        {".pyd", "rb", C_EXTENSION},
-        {".dll", "rb", C_EXTENSION},
-        {0, 0}
+    {".pyd", "rb", C_EXTENSION},
+    {".dll", "rb", C_EXTENSION},
+    {0, 0}
 };
 
 dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
-                                    const char *pathname, FILE *fp)
+                                    const char *pathname, FILE *fp)
 {
-        dl_funcptr p;
-        APIRET  rc;
-        HMODULE hDLL;
-        char failreason[256];
-        char funcname[258];
+    dl_funcptr p;
+    APIRET  rc;
+    HMODULE hDLL;
+    char failreason[256];
+    char funcname[258];
 
-        rc = DosLoadModule(failreason,
-                           sizeof(failreason),
-                           pathname,
-                           &hDLL);
+    rc = DosLoadModule(failreason,
+                       sizeof(failreason),
+                       pathname,
+                       &hDLL);
 
-        if (rc != NO_ERROR) {
-                char errBuf[256];
-                PyOS_snprintf(errBuf, sizeof(errBuf),
-                              "DLL load failed, rc = %d: %.200s",
-                              rc, failreason);
-                PyErr_SetString(PyExc_ImportError, errBuf);
-                return NULL;
-        }
+    if (rc != NO_ERROR) {
+        char errBuf[256];
+        PyOS_snprintf(errBuf, sizeof(errBuf),
+                      "DLL load failed, rc = %d: %.200s",
+                      rc, failreason);
+        PyErr_SetString(PyExc_ImportError, errBuf);
+        return NULL;
+    }
 
-        PyOS_snprintf(funcname, sizeof(funcname), "init%.200s", shortname);
-        rc = DosQueryProcAddr(hDLL, 0L, funcname, &p);
-        if (rc != NO_ERROR)
-                p = NULL; /* Signify Failure to Acquire Entrypoint */
-        return p;
+    PyOS_snprintf(funcname, sizeof(funcname), "init%.200s", shortname);
+    rc = DosQueryProcAddr(hDLL, 0L, funcname, &p);
+    if (rc != NO_ERROR)
+        p = NULL; /* Signify Failure to Acquire Entrypoint */
+    return p;
 }