Changeset a054302 in git

Timestamp:

Jan 29, 2015, 12:04:46 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

100bd496fb3125687ec86ff10fc3604c78620e47

Parents:

9f60696b949cb32e69968e88bd6fe9173f248612

Message:

some blackbox/newstruct checks and warnings

Location:

Singular

Files:

• blackbox.cc (modified) (1 diff)
• extra.cc (modified) (2 diffs)

Singular/blackbox.cc

@@ -147 +147 @@
   else
   {
+    // check for alreday defined bb:
+    for (int i=0;i<MAX_BB_TYPES;i++)
+    {
+      if ((blackboxName[i]!=NULL) && (strcmp(blackboxName[i],n)==0))
+      {
+        Warn("redefining blackbox type %s (%d -> %d)",n,i+BLACKBOX_OFFSET,where+BLACKBOX_OFFSET);
+      }
+    }
     blackboxTable[where]=bb;
     blackboxName[where]=omStrDup(n);

Singular/extra.cc

@@ -863 +863 @@
       {
         int id=0;
-        blackboxIsCmd((char*)h->Data(),id);
+        char *n=(char*)h->Data();
+        blackboxIsCmd(n,id);
         if (id>0)
         {
@@ -873 +874 @@
             return FALSE;
           }
-        }
+          else Werror("'%s' is not a newstruct",n);
+        }
+        else Werror("'%s' is not a blackbox object",n);
       }
       return TRUE;