Changeset 222 for Evidence/Evidence.cc

Timestamp:

06/08/10 13:14:10 (14 years ago)

Author:

ogrimm

Message:

History buffer contains also DIM service format

File:

• Evidence/Evidence.cc (modified) (3 diffs)

Evidence/Evidence.cc

@@ -388 +388 @@
 
   memcpy(Buffer, R.getData(), BufferSize);
+  DataStart = Buffer + strlen(Buffer) + 1;
   Rewind();
   
@@ -399 +400 @@
 
   // Check for wrap around
-  if (memcmp(Pointer, &WrapMark, sizeof(WrapMark)) == 0) Pointer = (struct Item *) (Buffer + 4);
-  
+  if (memcmp(Pointer, &WrapMark, sizeof(WrapMark)) == 0) Pointer = (struct Item *) (DataStart + sizeof(int));
   // Check if at end of ring buffer
   if (memcmp(Pointer, &EndMark, sizeof(EndMark)) == 0) return NULL;
 
   const struct Item *Ret = Pointer;
-  Pointer = (struct Item *) ((char *) (Pointer + 1) + Pointer->Size);
+  Pointer = (struct Item *) ((char *) (Ret + 1) + Ret->Size);
 
   return Ret;
@@ -413 +413 @@
 void EvidenceHistory::Rewind() {
 
-  if (Buffer != NULL) Pointer = (struct Item *) (Buffer + (*(int *) Buffer));
-}
+  if (Buffer != NULL) Pointer = (struct Item *) (DataStart + (*(int *) DataStart));
+}
+
+// Return DIM format string of service (NULL if no data)
+char *EvidenceHistory::GetFormat() {
+
+  return Buffer;
+}