Changeset eff324 in git


Ignore:
Timestamp:
Aug 1, 2012, 11:04:39 PM (10 years ago)
Author:
Alexander Dreyer <alexander.dreyer@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '96ce329119711a2b80858c8365abd29f8460bbfa')
Children:
632c3a619d605d6b049c3f7f82a323ea8113e34b
Parents:
ed47aab1ca04dedabc7c40435071af5af05f4c3a
Message:
chg: disclosuring fewer of newstruct
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/newstruct.cc

    red47aab reff324  
    613613   return NULL;
    614614}
    615 
    616 newstruct_desc newstructDesc()
     615newstruct_desc newstructFromString(const char *s)
    617616{
    618617  newstruct_desc res=(newstruct_desc)omAlloc0(sizeof(*res));
    619618  res->size=0;
    620   return res;
    621 }
    622 
    623 newstruct_desc newstructFromString(const char *s)
    624 {
    625   return scanNewstructFromString(s, newstructDesc());
    626 }
    627 
     619
     620  return scanNewstructFromString(s,res);
     621}
    628622newstruct_desc newstructChildFromString(const char *parent, const char *s)
    629623{
     
    670664  blackbox *bb=getBlackboxStuff(id);
    671665  newstruct_desc desc=(newstruct_desc)bb->data;
     666  if (desc == NULL)
     667  {
     668    desc=(newstruct_desc)omAlloc0(sizeof(*desc));
     669    desc->size=0;
     670    bb->data = (void*)desc;
     671  }
     672
    672673  newstruct_proc p=(newstruct_proc)omAlloc(sizeof(*p));
    673674  p->next=desc->procs; desc->procs=p;
  • Singular/newstruct.h

    red47aab reff324  
    55
    66void newstruct_setup(const char * name, newstruct_desc d);
    7 newstruct_desc newstructDesc();
    87newstruct_desc newstructFromString(const char *s);
    98newstruct_desc newstructChildFromString(const char *p, const char *s);
    109BOOLEAN newstruct_set_proc(const char *name,const char *func,int args, procinfov p);
    1110void newstructShow(newstruct_desc d);
     11
    1212#endif
  • Singular/pyobject.cc

    red47aab reff324  
    652652  b->blackbox_Op3     = pyobject_Op3;
    653653  b->blackbox_OpM     = pyobject_OpM;
    654   b->data = newstructDesc();
    655654
    656655  PythonInterpreter::init(setBlackboxStuff(b,"pyobject"));
Note: See TracChangeset for help on using the changeset viewer.