Diff for /embedaddon/libxml2/xmlmodule.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:37:58 version 1.1.1.2, 2014/06/15 19:53:28
Line 30  static int xmlModulePlatformSymbol(void *handle, const Line 30  static int xmlModulePlatformSymbol(void *handle, const
   
 /************************************************************************  /************************************************************************
  *                                                                      *   *                                                                      *
 *              module memory error handler                             * *                module memory error handler                             *
  *                                                                      *   *                                                                      *
  ************************************************************************/   ************************************************************************/
   
Line 61  xmlModuleErrMemory(xmlModulePtr module, const char *ex Line 61  xmlModuleErrMemory(xmlModulePtr module, const char *ex
  * @options: a set of xmlModuleOption   * @options: a set of xmlModuleOption
  *   *
  * Opens a module/shared library given its name or path   * Opens a module/shared library given its name or path
    * NOTE: that due to portability issues, behaviour can only be
    * guaranteed with @name using ASCII. We canot guarantee that
    * an UTF-8 string would work, which is why name is a const char *
    * and not a const xmlChar * .
  * TODO: options are not yet implemented.   * TODO: options are not yet implemented.
  *   *
  * Returns a handle for the module or NULL in case of error   * Returns a handle for the module or NULL in case of error
Line 99  xmlModuleOpen(const char *name, int options ATTRIBUTE_ Line 103  xmlModuleOpen(const char *name, int options ATTRIBUTE_
  * @symbol: the resulting symbol address   * @symbol: the resulting symbol address
  *   *
  * Lookup for a symbol address in the given module   * Lookup for a symbol address in the given module
    * NOTE: that due to portability issues, behaviour can only be
    * guaranteed with @name using ASCII. We canot guarantee that
    * an UTF-8 string would work, which is why name is a const char *
    * and not a const xmlChar * .
  *   *
  * Returns 0 if the symbol was found, or -1 in case of error   * Returns 0 if the symbol was found, or -1 in case of error
  */   */
Line 106  int Line 114  int
 xmlModuleSymbol(xmlModulePtr module, const char *name, void **symbol)  xmlModuleSymbol(xmlModulePtr module, const char *name, void **symbol)
 {  {
     int rc = -1;      int rc = -1;
        
     if ((NULL == module) || (symbol == NULL)) {      if ((NULL == module) || (symbol == NULL)) {
         __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_MODULE,          __xmlRaiseError(NULL, NULL, NULL, NULL, NULL, XML_FROM_MODULE,
                         XML_MODULE_OPEN, XML_ERR_FATAL, NULL, 0, 0,                          XML_MODULE_OPEN, XML_ERR_FATAL, NULL, 0, 0,
Line 300  xmlModulePlatformSymbol(void *handle, const char *name Line 308  xmlModulePlatformSymbol(void *handle, const char *name
 static void *  static void *
 xmlModulePlatformOpen(const char *name)  xmlModulePlatformOpen(const char *name)
 {  {
    return LoadLibrary(name);    return LoadLibraryA(name);
 }  }
   
 /*  /*
Line 326  xmlModulePlatformClose(void *handle) Line 334  xmlModulePlatformClose(void *handle)
 static int  static int
 xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)  xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
 {  {
   #ifdef _WIN32_WCE
       /*
        * GetProcAddressA seems only available on WinCE
        */
       *symbol = GetProcAddressA(handle, name);
   #else
     *symbol = GetProcAddress(handle, name);      *symbol = GetProcAddress(handle, name);
   #endif
     return (NULL == *symbol) ? -1 : 0;      return (NULL == *symbol) ? -1 : 0;
 }  }
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>