[ViewVC] Diff of: cvs/deliantra/server/include/cfperl.h

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.56 by root, Thu Feb 15 21:07:49 2007 UTC vs.
Revision 1.59 by root, Thu Mar 1 19:32:58 2007 UTC

     F_DESTROYED   = 0x01,
     F_DEBUG_TRACE = 0x02,
   };
   // object is delete'd after the refcount reaches 0
+  int ACC (RW, flags);
   mutable int ACC (RW, refcnt);
-  int ACC (RW, flags);
   MTH void refcnt_inc () const { ++refcnt; }
   MTH void refcnt_dec () const { --refcnt; }
   MTH int refcnt_cnt () const;
   operator bool () { return !!av; }
 };
 // compatibility support, should be removed when no longer needed
-int fprintf (object_freezer &freezer, const char *format, ...);
+void fprintf (object_freezer &freezer, const char *format, ...);
-int fputs (const char *s, object_freezer &freezer);
+void fputs (const char *s, object_freezer &freezer);
 struct object_thawer
 {
   SV *text; // text part
   AV *av;   // perl part
   ~object_thawer ();
   void get (attachable *obj, int oid);
   // parse next line
-  void next_kv ();
+  void next ();
-  //TODO: remove
-  keyword get_kv ()
-  {
-    next_kv ();
-    return kw;
-  }
   // skip the current key-value (usually fetch next line, for
   // multiline-fields, skips untilt he corresponding end-kw
-  void skip_kv ();
+  void skip ();
+  //TODO: remove, deprecated
+  keyword get_kv ()
+  {
+    next ();
+    return kw;
+  }
-  const char *get_str () { return value; } // may be 0
+  char *get_str () { return value; } // may be 0
   void get (shstr &sh) const;
   void get_ornull (shstr &sh) const { sh = value; }
   void get_ml (keyword kend, shstr &sh);

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