[ViewVC] Diff of: cvs/deliantra/server/server/freezethaw.C

Comparing deliantra/server/server/freezethaw.C (file contents):
Revision 1.24 by root, Wed Aug 1 20:07:06 2007 UTC vs.
Revision 1.25 by root, Tue Sep 4 05:43:22 2007 UTC

             SvCUR_set (text, len);
             memcpy (SvPVX (text), sv_, len);
             memcpy (SvEND (text), eof, sizeof (eof)); // just to be sure
             line = SvPVX (text);
+            next ();
           }
         }
       CALL_END;
     }
 {
   av   = perlav;
   text = newSVpv (data, 0);
   sv_catpv (text, thawer_eof);
   line = SvPVbyte_nolen (text);
+  next ();
 }
 void
 object_thawer::get (attachable *obj, int oid)
 {
 object_thawer::~object_thawer ()
 {
   if (text) SvREFCNT_dec (text);
   if (av)   SvREFCNT_dec (av);
+  resolve_delayed_derefs (false);
   free ((void *)name);
 }
 //TODO: remove
   next ();
 }
 void
+object_thawer::skip_block ()
+{
+  while (kw != KW_ERROR && kw != KW_EOF)
+    {
+      keyword w = kw;
+      skip ();
+      if (w == KW_end)
+        break;
+    }
+}
+void
 object_thawer::get_ml (keyword kend, shstr &sh)
 {
   char kw[128];
   int klen = keyword_len [kend];
   while (*p);
   return negate ? -val : val;
 }
+void
+object_thawer::delayed_deref (attachable *op, object_ptr &ptr, const char *ref)
+{
+  op->refcnt_inc ();
+  delayed_ref r = { op, &ptr, ref ? strdup (ref) : 0 };
+  delrefs.push_back (r);
+  ptr = 0;
+}
+void
+object_thawer::resolve_delayed_derefs (bool deref)
+{
+  while (!delrefs.empty ())
+    {
+      delayed_ref r = delrefs.back ();
+      delrefs.pop_back ();
+      if (deref)
+        *r.ptr = object::deref (r.ref);
+      free ((void *)r.ref);
+      r.op->refcnt_dec ();
+    }
+}

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines