Changeset d5efda0 in git

Timestamp:

May 12, 2020, 1:25:08 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

d164a64639760b1b76e1c4211cff9efd79516cb3

Parents:

9455f494a454ede53ef2b4d5bcd15d96ed7b0b2a

Message:

opt: iiLibCmd

Location:

Singular

Files:

• iplib.cc (modified) (6 diffs)
• misc_ip.cc (modified) (1 diff)

Singular/iplib.cc

@@ -663 +663 @@
   if (h==NULL)
   {
-    BOOLEAN bo=iiLibCmd(omStrDup(lib),TRUE,TRUE,FALSE);
+    BOOLEAN bo=iiLibCmd(lib,TRUE,TRUE,FALSE);
     if (bo) return NULL;
   }
@@ -682 +682 @@
   if (h==NULL)
   {
-    BOOLEAN bo=iiLibCmd(omStrDup(lib),TRUE,TRUE,FALSE);
+    BOOLEAN bo=iiLibCmd(lib,TRUE,TRUE,FALSE);
     if (bo) return 0;
   }
@@ -831 +831 @@
     if((LT = type_of_LIB(libname, libnamebuf)) > LT_NOTFOUND)
     {
-      char *s=omStrDup(libname);
       #ifdef HAVE_DYNAMIC_LOADING
       char libnamebuf[1024];
@@ -837 +836 @@
 
       if (LT==LT_SINGULAR)
-        LoadResult = iiLibCmd(s, FALSE, FALSE,TRUE);
+        LoadResult = iiLibCmd(libname, FALSE, FALSE,TRUE);
       #ifdef HAVE_DYNAMIC_LOADING
       else if ((LT==LT_ELF) || (LT==LT_HPUX))
-        LoadResult = load_modules(s,libnamebuf,FALSE);
+        LoadResult = load_modules(libname,libnamebuf,FALSE);
       #endif
       else if (LT==LT_BUILTIN)
       {
-        LoadResult=load_builtin(s,FALSE, iiGetBuiltinModInit(s));
+        LoadResult=load_builtin(libname,FALSE, iiGetBuiltinModInit(libname));
       }
       if(!LoadResult )
@@ -914 +913 @@
   }
   LoadResult = iiLoadLIB(fp, libnamebuf, newlib, pl, autoexport, tellerror);
-  omFree((ADDRESS)newlib);
 
   if(!LoadResult) IDPACKAGE(pl)->loaded = TRUE;
@@ -1281 +1279 @@
 }
 
-BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport) {
+BOOLEAN load_modules(const char *newlib, char *fullname, BOOLEAN autoexport)
+{
   GLOBAL_VAR static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
   pthread_mutex_lock(&mutex);

Singular/misc_ip.cc

@@ -1460 +1460 @@
     SI_SAVE_OPT(save1,save2);
     si_opt_2 &= ~Sy_bit(V_LOAD_LIB);
-    iiLibCmd(omStrDup("standard.lib"), TRUE,TRUE,TRUE);
+    iiLibCmd("standard.lib", TRUE,TRUE,TRUE);
     SI_RESTORE_OPT(save1,save2);
   }