Changeset 352 for trunk/nom/class_c/nomcls.c

Timestamp:

Jun 7, 2008, 10:39:28 AM (17 years ago)

Author:

cinc

Message:

Prevent using NULL ptr. Make output more verbose.

File:

• trunk/nom/class_c/nomcls.c (modified) (2 diffs)

trunk/nom/class_c/nomcls.c

@@ -286 +286 @@
            metaclass may create. */
 
-        nomPrintf("%s: Metaclass already registered, registering normal object class now.\n", __FUNCTION__);
+        nomPrintf("%s (%d): Metaclass already registered, registering normal object class now.\n", __FUNCTION__, __LINE__);
 
         ncPriv=(NOMClassPriv*)_nomGetObjectCreateInfo(nomSelf, NULL);//nomSelf->mtab->nomClsInfo;
-        // ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
-        ncPriv->ulClassFlags&=~NOM_FLG_IS_METACLASS; /* Mark that we are not a metaclass (should be 0 already) */
+        
         if(ncPriv){
           gulong a, ulNumIntroducedMethods;
+
+          // ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
+          ncPriv->ulClassFlags&=~NOM_FLG_IS_METACLASS; /* Mark that we are not a metaclass (should be 0 already) */
+
+          if(_nomFindClassFromName(NOMClassMgrObject, ncPriv->mtab->nomClassName,
+                                   0, 0, &tempEnv))
+            nomPrintf("%s: %s already registered\n", __FUNCTION__, ncPriv->mtab->nomClassName);
+          
           /* Register all the methods this class introduces */
           ulNumIntroducedMethods=ncPriv->sci->ulNumStaticMethods;
@@ -301 +308 @@
                                    *ncPriv->sci->nomSMethods[a].chrMethodDescriptor, NULL);
             }
-          //nomPrintf("%s %s \n", nomSelf->mtab->nomClassName, ncPriv->mtab->nomClassName);
+          //nomPrintf("%s %s %s \n", __FUNCTION__, nomSelf->mtab->nomClassName, ncPriv->mtab->nomClassName);
           _nomRegisterClass(NOMClassMgrObject, ncPriv->mtab, NULL);
         }