Changeset d5efda0 in git
- Timestamp:
- May 12, 2020, 1:25:08 PM (4 years ago)
- Branches:
- (u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
- Children:
- d164a64639760b1b76e1c4211cff9efd79516cb3
- Parents:
- 9455f494a454ede53ef2b4d5bcd15d96ed7b0b2a
- Location:
- Singular
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iplib.cc
r9455f49 rd5efda0 663 663 if (h==NULL) 664 664 { 665 BOOLEAN bo=iiLibCmd( omStrDup(lib),TRUE,TRUE,FALSE);665 BOOLEAN bo=iiLibCmd(lib,TRUE,TRUE,FALSE); 666 666 if (bo) return NULL; 667 667 } … … 682 682 if (h==NULL) 683 683 { 684 BOOLEAN bo=iiLibCmd( omStrDup(lib),TRUE,TRUE,FALSE);684 BOOLEAN bo=iiLibCmd(lib,TRUE,TRUE,FALSE); 685 685 if (bo) return 0; 686 686 } … … 831 831 if((LT = type_of_LIB(libname, libnamebuf)) > LT_NOTFOUND) 832 832 { 833 char *s=omStrDup(libname);834 833 #ifdef HAVE_DYNAMIC_LOADING 835 834 char libnamebuf[1024]; … … 837 836 838 837 if (LT==LT_SINGULAR) 839 LoadResult = iiLibCmd( s, FALSE, FALSE,TRUE);838 LoadResult = iiLibCmd(libname, FALSE, FALSE,TRUE); 840 839 #ifdef HAVE_DYNAMIC_LOADING 841 840 else if ((LT==LT_ELF) || (LT==LT_HPUX)) 842 LoadResult = load_modules( s,libnamebuf,FALSE);841 LoadResult = load_modules(libname,libnamebuf,FALSE); 843 842 #endif 844 843 else if (LT==LT_BUILTIN) 845 844 { 846 LoadResult=load_builtin( s,FALSE, iiGetBuiltinModInit(s));845 LoadResult=load_builtin(libname,FALSE, iiGetBuiltinModInit(libname)); 847 846 } 848 847 if(!LoadResult ) … … 914 913 } 915 914 LoadResult = iiLoadLIB(fp, libnamebuf, newlib, pl, autoexport, tellerror); 916 omFree((ADDRESS)newlib);917 915 918 916 if(!LoadResult) IDPACKAGE(pl)->loaded = TRUE; … … 1281 1279 } 1282 1280 1283 BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport) { 1281 BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport) 1282 { 1284 1283 GLOBAL_VAR static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; 1285 1284 pthread_mutex_lock(&mutex); -
Singular/misc_ip.cc
r9455f49 rd5efda0 1460 1460 SI_SAVE_OPT(save1,save2); 1461 1461 si_opt_2 &= ~Sy_bit(V_LOAD_LIB); 1462 iiLibCmd( omStrDup("standard.lib"), TRUE,TRUE,TRUE);1462 iiLibCmd("standard.lib", TRUE,TRUE,TRUE); 1463 1463 SI_RESTORE_OPT(save1,save2); 1464 1464 }
Note: See TracChangeset
for help on using the changeset viewer.