incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1372791 - /incubator/ooo/trunk/main/sal/osl/os2/module.c
Date Tue, 14 Aug 2012 09:13:58 GMT
Author: ydario
Date: Tue Aug 14 09:13:58 2012
New Revision: 1372791

URL: http://svn.apache.org/viewvc?rev=1372791&view=rev
Log:
i118923 - OS/2 port: fix reporting of error message.

Modified:
    incubator/ooo/trunk/main/sal/osl/os2/module.c

Modified: incubator/ooo/trunk/main/sal/osl/os2/module.c
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/osl/os2/module.c?rev=1372791&r1=1372790&r2=1372791&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/osl/os2/module.c (original)
+++ incubator/ooo/trunk/main/sal/osl/os2/module.c Tue Aug 14 09:13:58 2012
@@ -106,21 +106,15 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
 #if OSL_DEBUG_LEVEL>10
 			debug_printf("osl_loadModule module %s", buffer);
 #endif
-            //rc = _DosLoadModule( szErrorMessage, sizeof( szErrorMessage), (PCSZ)buffer,
&hModule);
-	    //if (rc == NO_ERROR )
 			hModule = dlopen( buffer, RTLD_LOCAL);
 			if (hModule != NULL )
 				pModule = (oslModule)hModule;
 			else
 			{
-				if (rc == NO_ERROR )
-					pModule = (oslModule)hModule;
-				else
-				{
 					sal_Char szError[ PATH_MAX*2 ];
-					sprintf( szError, "Module: %s; rc: %d;\nReason: %s;\n"
+					sprintf( szError, "Module: %s; errno: %d;\n"
 							"Please contact technical support and report above informations.\n\n", 
-							buffer, rc, szErrorMessage );
+							buffer, errno );
 #if OSL_DEBUG_LEVEL>0
 					fprintf( stderr, szError);
 #endif
@@ -131,7 +125,6 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
 						szError, "Critical error: DosLoadModule failed",
 						0, MB_ERROR | MB_OK | MB_MOVEABLE);
 #endif
-				}
 			}
 		}
     }



Mime
View raw message