Changeset eff324 in git for Singular/newstruct.cc

Timestamp:

Aug 1, 2012, 11:04:39 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

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

Children:

632c3a619d605d6b049c3f7f82a323ea8113e34b

Parents:

ed47aab1ca04dedabc7c40435071af5af05f4c3a

Message:

chg: disclosuring fewer of newstruct

File:

• Singular/newstruct.cc (modified) (2 diffs)

Singular/newstruct.cc

@@ -613 +613 @@
    return NULL;
 }
-
-newstruct_desc newstructDesc()
+newstruct_desc newstructFromString(const char *s)
 {
   newstruct_desc res=(newstruct_desc)omAlloc0(sizeof(*res));
   res->size=0;
-  return res;
-}
-
-newstruct_desc newstructFromString(const char *s)
-{
-  return scanNewstructFromString(s, newstructDesc());
-}
-
+
+  return scanNewstructFromString(s,res);
+}
 newstruct_desc newstructChildFromString(const char *parent, const char *s)
 {
@@ -670 +664 @@
   blackbox *bb=getBlackboxStuff(id);
   newstruct_desc desc=(newstruct_desc)bb->data;
+  if (desc == NULL)
+  {
+    desc=(newstruct_desc)omAlloc0(sizeof(*desc));
+    desc->size=0;
+    bb->data = (void*)desc;
+  }
+
   newstruct_proc p=(newstruct_proc)omAlloc(sizeof(*p));
   p->next=desc->procs; desc->procs=p;