*** empty log message ***

src/lib/co/src/co_dbs.c

@@ -445,9 +445,14 @@ dbs_Map(pwr_tStatus *sts, dbs_sEnv *ep, const char *filename)
     printf("name_bt....: %d.%d -> %d.%d %d\n", nf.b.sect, nf.b.offs, nl.b.sect, nl.b.offs, vp->name_bt.rsize);
     printf("class_bt...: %d.%d -> %d.%d %d\n", cf.b.sect, cf.b.offs, cl.b.sect, cl.b.offs, vp->class_bt.rsize);
     printf("oid_bt.....: %d.%d -> %d.%d %d\n", of.b.sect, of.b.offs, ol.b.sect, ol.b.offs, vp->oid_bt.rsize);
-    
 
-    ep->sect = (dbs_sSect*)((char *)fp + dbs_dAlign(sizeof(dbs_sFile)));
+    ep->sect     = (dbs_sSect*)(ep->base + dbs_dAlign(sizeof(dbs_sFile)));
+    ep->vp       = (dbs_sVolume*)(ep->base + ep->sect[dbs_eSect_volume].offset);
+    ep->vrp      = (dbs_sVolRef*)(ep->base + ep->sect[dbs_eSect_volref].offset);
+    ep->name_bt  = (dbs_sBintab*)(ep->base + ep->sect[dbs_eSect_name].offset);
+    ep->oid_bt   = (dbs_sBintab*)(ep->base + ep->sect[dbs_eSect_oid].offset);
+    ep->class_bt = (dbs_sBintab*)(ep->base + ep->sect[dbs_eSect_class].offset);
+
     sp = (dbs_sSect*)((char *)fp + dbs_dAlign(sizeof(dbs_sFile)));
 
     for (i = 0; i < dbs_eSect_; i++, sp++) {

src/lib/co/src/co_dbs.pdr

@@ -518,6 +518,11 @@ struct dbs_sName {
 %    pwr_tUInt32  size;    /**< size of mapped file */
 %    char         *base;
 %    dbs_mEnv flags;
+%    dbs_sVolume  *vp;
+%    dbs_sVolRef  *vrp;
+%    dbs_sBintab  *name_bt;        /**< search for object with parent and name  */
+%    dbs_sBintab  *oid_bt;         /**< search for object with identity  */
+%    dbs_sBintab  *class_bt;       /**< search for object with class  */
 %} dbs_sEnv;
 %
 %

wb/lib/wb/src/wb_vrepdbs.cpp

@@ -32,7 +32,8 @@ wb_vrepdbs::dbsenv()
             throw wb_error(sts);
         }
         m_isDbsenvLoaded = true;
-        dbs_GetVolumeName(&sts, &m_dbsenv, m_name);
+        strcpy(m_name, m_dbsenv.vp->name);
+        m_vid = m_dbsenv.vp->vid;
     } else {
         ep = &m_dbsenv;
     }