/[ascend]/trunk/base/generic/compiler/importhandler.c
ViewVC logotype

Diff of /trunk/base/generic/compiler/importhandler.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 894 by johnpye, Wed Oct 11 14:53:27 2006 UTC revision 895 by johnpye, Tue Oct 24 00:12:34 2006 UTC
# Line 163  int importhandler_extlib_import(const st Line 163  int importhandler_extlib_import(const st
163          ASC_FREE(stem);          ASC_FREE(stem);
164    
165          strncat(auto_initfunc,"_register",PATH_MAX-strlen(auto_initfunc));          strncat(auto_initfunc,"_register",PATH_MAX-strlen(auto_initfunc));
166          CONSOLE_DEBUG("Created auto-initfunc name '%s'",auto_initfunc);          /* CONSOLE_DEBUG("Created auto-initfunc name '%s'",auto_initfunc); */
167          result = Asc_DynamicLoad(path,auto_initfunc);          result = Asc_DynamicLoad(path,auto_initfunc);
168      }else{      }else{
169          result = Asc_DynamicLoad(path,initfunc);          result = Asc_DynamicLoad(path,initfunc);
# Line 377  struct FilePath *importhandler_findinpat Line 377  struct FilePath *importhandler_findinpat
377          path=defaultpath;          path=defaultpath;
378      }      }
379    
380      CONSOLE_DEBUG("SEARCHPATH IS %s",path);      /* CONSOLE_DEBUG("SEARCHPATH IS %s",path); */
381      sp = ospath_searchpath_new(path);      sp = ospath_searchpath_new(path);
382    
383      if(NULL==ospath_searchpath_iterate(sp,&importhandler_search_test,&searchdata)){      if(NULL==ospath_searchpath_iterate(sp,&importhandler_search_test,&searchdata)){
# Line 420  void *importhandler_getsharedpointer(con Line 420  void *importhandler_getsharedpointer(con
420      importhandler_createsharedpointertable();      importhandler_createsharedpointertable();
421      if(key==NULL){      if(key==NULL){
422          ERROR_REPORTER_HERE(ASC_PROG_ERR,"key is NULL");          ERROR_REPORTER_HERE(ASC_PROG_ERR,"key is NULL");
423          return 1;          return NULL;
424      }      }
425      return LookupTableData(importhandler_sharedpointers,key);      return LookupTableData(importhandler_sharedpointers,key);
426  }  }

Legend:
Removed from v.894  
changed lines
  Added in v.895

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22