Changeset 14580 for trunk/FACT++/dim/src

Timestamp:

11/07/12 18:09:19 (12 years ago)

Author:

tbretz

Message:

Update to v20r02.

Location:

trunk/FACT++/dim/src

Files:

• dic.c (modified) (3 diffs)
• diccpp.cxx (modified) (5 diffs)

trunk/FACT++/dim/src/dic.c

@@ -757 +757 @@
                                 if(servp->fill_size > 0)
                                         free( servp->fill_address );
-                                fillp = 0;
+                                fillp = serv_address;
                                 if(serv_size > 0)
                                 {
@@ -814 +814 @@
         newp->user_routine = routine;
         newp->tag = tag;
-        fillp = 0;
+        fillp = fill_addr;
         if(fill_size > 0)
         {
@@ -885 +885 @@
         if(servp->fill_size > 0)
                 free( servp->fill_address );
-        fillp = 0;
+        fillp = fill_addr;
         if(fill_size > 0)
         {

trunk/FACT++/dim/src/diccpp.cxx

@@ -168 +168 @@
         itsName = new char[strlen(name)+1];
         strcpy(itsName,name);
+        itsNolinkBuf = nolink;
+        itsNolinkSize = nolinksize;
         if(nolinksize > 0)
         {
@@ -253 +255 @@
         itsName = new char[strlen(name)+1];
         strcpy(itsName,name);
+        itsNolinkBuf = nolink;
+        itsNolinkSize = nolinksize;
         if(nolinksize > 0)
         {
@@ -311 +315 @@
         itsName = new char[strlen(name)+1];
         strcpy(itsName,name);
+        itsNolinkBuf = nolink;
+        itsNolinkSize = nolinksize;
         if(nolinksize > 0)
         {
@@ -400 +406 @@
         itsName = new char[strlen(name)+1];
         strcpy(itsName,name);
+        itsNolinkBuf = nolink;
+        itsNolinkSize = nolinksize;
         if(nolinksize > 0)
         {
@@ -687 +695 @@
         itsDataOutSize = 0;
         itsDataOut = 0;
-        itsNolinkBuf = new char[nolinksize];
+        itsNolinkBuf = nolink;
         itsNolinkSize = nolinksize;
-        memcpy(itsNolinkBuf, nolink, nolinksize);
+        if(nolinksize > 0)
+        {
+                itsNolinkBuf = new char[nolinksize];
+                itsNolinkSize = nolinksize;
+                memcpy(itsNolinkBuf, nolink, nolinksize);
+        }
         itsNameOut = new char[strlen(name)+1+10];
         strcpy(itsNameOut,name);