Commit bb71ab68 authored by Guido van Rossum's avatar Guido van Rossum

Reindented some OS/2 and hpux code that looked ugly or at least

inconsistent.
parent 7ba30431
...@@ -519,7 +519,8 @@ _PyImport_LoadDynamicModule(name, pathname, fp) ...@@ -519,7 +519,8 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
if (rc != NO_ERROR) { if (rc != NO_ERROR) {
char errBuf[256]; char errBuf[256];
sprintf(errBuf, sprintf(errBuf,
"DLL load failed, rc = %d, problem '%s': %s", rc, failreason); "DLL load failed, rc = %d, problem '%s': %s",
rc, failreason);
PyErr_SetString(PyExc_ImportError, errBuf); PyErr_SetString(PyExc_ImportError, errBuf);
return NULL; return NULL;
} }
...@@ -574,16 +575,14 @@ _PyImport_LoadDynamicModule(name, pathname, fp) ...@@ -574,16 +575,14 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
int flags; int flags;
flags = BIND_FIRST | BIND_DEFERRED; flags = BIND_FIRST | BIND_DEFERRED;
if (Py_VerboseFlag) if (Py_VerboseFlag) {
{
flags = DYNAMIC_PATH | BIND_FIRST | BIND_IMMEDIATE | flags = DYNAMIC_PATH | BIND_FIRST | BIND_IMMEDIATE |
BIND_NONFATAL | BIND_VERBOSE; BIND_NONFATAL | BIND_VERBOSE;
printf("shl_load %s\n",pathname); printf("shl_load %s\n",pathname);
} }
lib = shl_load(pathname, flags, 0); lib = shl_load(pathname, flags, 0);
/* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */ /* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */
if (lib == NULL) if (lib == NULL) {
{
char buf[256]; char buf[256];
if (Py_VerboseFlag) if (Py_VerboseFlag)
perror(pathname); perror(pathname);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment