Changeset df326b in git for Singular/links/silink.cc

Timestamp:

Feb 19, 2013, 9:43:53 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

20fee797b7a66e0f0dd4d487a5647e70eeee2f8e

Parents:

44ca2ffccdd8d9f8f06ceab239425b54669e3200

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-19 21:43:53+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-20 14:50:04+01:00

Message:

Updates due to master (links) + SW adaptation/separation

File:

• Singular/links/silink.cc (modified) (5 diffs)

Singular/links/silink.cc

@@ -220 +220 @@
 }
 
+BOOLEAN slPrepClose(si_link l)
+{
+
+  if(! SI_LINK_OPEN_P(l))
+    return FALSE;
+
+  BOOLEAN res = TRUE;
+  if (l->m->PrepClose != NULL)
+  {
+    res = l->m->PrepClose(l);
+    if (res)
+      Werror("close: Error for link of type: %s, mode: %s, name: %s",
+           l->m->type, l->mode, l->name);
+  }
+  return res;
+}
+
 BOOLEAN slClose(si_link l)
 {
@@ -339 +356 @@
       Werror("dump: Error for link of type %s, mode: %s, name: %s",
              l->m->type, l->mode, l->name);
-
     if (!SI_LINK_R_OPEN_P(l)) slClose(l); // do not close r/w links
     return res;
@@ -383 +399 @@
 
 /* =============== ASCII ============================================= */
-BOOLEAN slOpenAscii(si_link l, short flag, leftv)
+BOOLEAN slOpenAscii(si_link l, short flag, leftv h)
 {
   const char *mode;
@@ -841 +857 @@
   si_link_extension ns = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
 
-  if (0) 0;
+  if (0) 0; // dummy
 #ifdef HAVE_DBM
   else if (strcmp(type, "DBM") == 0)
@@ -877 +893 @@
   si_link_root->Open=slOpenAscii;
   si_link_root->Close=slCloseAscii;
-  si_link_root->Kill=slCloseAscii;
+  si_link_root->Kill=NULL;
   si_link_root->Read=slReadAscii;
   si_link_root->Read2=slReadAscii2;