Changeset 168 for Evidence/Evidence.cc

Timestamp:

02/12/10 11:37:22 (15 years ago)

Author:

ogrimm

Message:

Conversion to string can now handle arrays and structures

File:

• Evidence/Evidence.cc (modified) (1 diff)

Evidence/Evidence.cc

@@ -227 +227 @@
 
 // Translates DIMInfo to string (memory has to be freed by caller)
-// DIM structures are converted to hexadecimal representation
-// For string conversion, a terminating \0 is enforced.
 char *EvidenceServer::ToString(DimInfo *Item) {
 
   char *Text;
-  int R=0;
-  
+
+  // Structure: print hex representation (3 characters per byte)  
   if (strlen(Item->getFormat()) != 1) {
     if ((Text = (char *) malloc(3*Item->getSize()+1)) != NULL) {
           for (int i=0; i<Item->getSize(); i++) sprintf(Text+3*i, "%02x", *((char *) Item->getData() + i)); 
         }
-  }
-  else {
-        switch (*(Item->getFormat())) {
-      case 'I':  R = asprintf(&Text, "%d", Item->getInt());   break;
-      case 'S':  R = asprintf(&Text, "%hd", Item->getShort());   break;
-      case 'F':  R = asprintf(&Text, "%.5f", Item->getFloat());   break;
-      case 'D':  R = asprintf(&Text, "%.5f", Item->getDouble());   break;
-      case 'X':  R = asprintf(&Text, "%lld", Item->getLonglong());   break;
-      case 'C':  *(Item->getString() + Item->getSize() - 1) = '\0'; 
-                                 R = asprintf(&Text, "%s", Item->getString());
-                                 break;
-      default: return NULL;
+        return Text;
+  }
+
+  // String: terminating \0 is enforced
+  if (toupper(*(Item->getFormat())) == 'C') {  
+    *(Item->getString() + Item->getSize() - 1) = '\0'; 
+        if (asprintf(&Text, "%s", Item->getString()) == -1) return NULL;
+        return Text;
+  }
+
+  // Number array
+  int Size;
+  switch (toupper(*(Item->getFormat()))) {
+    case 'I':
+    case 'L': Size = sizeof(int);               break;
+    case 'S': Size = sizeof(short);             break;
+    case 'F': Size = sizeof(float);             break;
+    case 'D': Size = sizeof(double);    break;
+    case 'X': Size = sizeof(long long); break;
+    default: return NULL;
+  }
+
+  int Max, Mem = Item->getSize()*Size*4+1;
+  char *Pos;
+
+  if ((Text = (char *) malloc(Mem)) == NULL) return NULL;
+
+  *Text = '\0';
+  for (int i=0; i<Item->getSize()/Size; i++) {
+        Pos = Text+strlen(Text);
+        Max = Mem-strlen(Text);
+
+        switch (toupper(*(Item->getFormat()))) {
+      case 'I':
+      case 'L': snprintf(Pos, Max, "%d ", *((int *) Item->getData() + i));
+                                break;
+      case 'S': snprintf(Pos, Max, "%hd ", *((short *) Item->getData() + i));
+                                break;
+      case 'F': snprintf(Pos, Max, "%.5f ", *((float *) Item->getData() + i));
+                                break;
+      case 'D': snprintf(Pos, Max, "%.5f ", *((double *) Item->getData() + i));
+                                break;
+      case 'X': snprintf(Pos, Max, "%lld ", *((long long *) Item->getData() + i));
+                                break;
         }
   }
   
-  return (R == -1) ? NULL : Text;
+  return Text;
 }