Loading...
--- xnu/xnu-1228/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-2782.10.72/libkern/c++/OSSerialize.cpp
@@ -36,6 +36,7 @@
#include <libkern/c++/OSContainers.h>
#include <libkern/c++/OSLib.h>
#include <libkern/c++/OSDictionary.h>
+#include <libkern/OSSerializeBinary.h>
#define super OSObject
@@ -65,8 +66,17 @@
void OSSerialize::clearText()
{
- bzero((void *)data, capacity);
- length = 1;
+ if (binary)
+ {
+ length = sizeof(kOSSerializeBinarySignature);
+ bzero(&data[length], capacity - length);
+ endCollection = true;
+ }
+ else
+ {
+ bzero((void *)data, capacity);
+ length = 1;
+ }
tag = 0;
tags->flushCollection();
}
@@ -76,9 +86,12 @@
char temp[16];
OSString *tagString;
+ if (binary) return (binarySerialize(o));
+
// look it up
tagString = (OSString *)tags->getObject((const OSSymbol *) o);
+// xx-review: no error checking here for addString calls!
// does it exist?
if (tagString) {
addString("<reference IDREF=\"");
@@ -100,6 +113,11 @@
bool OSSerialize::addXMLStartTag(const OSMetaClassBase *o, const char *tagString)
{
+ if (binary)
+ {
+ printf("class %s: xml serialize\n", o->getMetaClass()->getClassName());
+ return (false);
+ }
if (!addChar('<')) return false;
if (!addString(tagString)) return false;
@@ -123,6 +141,12 @@
bool OSSerialize::addChar(const char c)
{
+ if (binary)
+ {
+ printf("xml serialize\n");
+ return (false);
+ }
+
// add char, possibly extending our capacity
if (length >= capacity && length >=ensureCapacity(capacity+capacityIncrement))
return false;