Changeset 41340 for trunk/Ohana/src/opihi/lib.shell/VectorOps.c

Timestamp:

Apr 16, 2020, 1:54:47 PM (6 years ago)

Author:

tdeboer

Message:

revert to working Ohana build

File:

• trunk/Ohana/src/opihi/lib.shell/VectorOps.c (modified) (9 diffs)

trunk/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -129 +129 @@
   if (mode == NEWVECTOR) goto error;
   if (vectors[i]) {
-    // XXX warning: this will be a leak if vector is type OPIHI_STR
     if (vectors[i][0].elements.Ptr) free (vectors[i][0].elements.Ptr);
     free (vectors[i]);
@@ -151 +150 @@
   if (i == Nvectors) return (FALSE);
 
-  // XXX warning: this will be a leak if vector is type OPIHI_STR
   if (vectors[i][0].elements.Ptr) free (vectors[i][0].elements.Ptr);
   free (vectors[i]);
@@ -172 +170 @@
   if (i == Nvectors) return (FALSE);
 
-  // XXX warning: this will be a leak if vector is type OPIHI_STR
   if (vectors[i][0].elements.Ptr) free (vectors[i][0].elements.Ptr);
   free (vectors[i]);
@@ -194 +191 @@
 
 int CopyVector (Vector *out, Vector *in) {
-  // XXX warning: this will be a leak if vector is type OPIHI_STR
   if (out[0].elements.Ptr) free (out[0].elements.Ptr);
   out[0].Nelements = in[0].Nelements;
@@ -212 +208 @@
 
 int MatchVector(Vector *out, Vector *in, char type) {
-  // XXX warning: this will be a leak if vector is type OPIHI_STR
   if (out[0].elements.Ptr) free (out[0].elements.Ptr);
   out[0].Nelements = in[0].Nelements;
@@ -227 +222 @@
 int ResetVector (Vector *vec, char type, int Nelements) {
 
-  // if the supplied vector is a string but the output is not a string, we need to free
-  // the unused elements
-  if ((vec[0].type == OPIHI_STR) && (vec[0].type != type)) {
-    for (int i = 0; i < vec[0].Nelements; i++) {
-      FREE (vec[0].elements.Str[i]);
-    }
-  }
-
   // a vector can only have >= 0 elements
   vec[0].Nelements = MAX(Nelements,0);
-
-  switch (type) {
-    case OPIHI_FLT:
-      REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1, Nelements));
-      vec[0].type = OPIHI_FLT;
-      break;
-    case OPIHI_INT:
-      REALLOCATE (vec[0].elements.Int, opihi_int, MAX(1, Nelements));
-      vec[0].type = OPIHI_INT;
-      break;
-    case OPIHI_STR:
-      REALLOCATE (vec[0].elements.Str, char *, MAX(1, Nelements));
-      vec[0].type = OPIHI_STR;
-      break;
+  if (type == OPIHI_FLT) {
+    REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1, Nelements));
+    vec[0].type = OPIHI_FLT;
+  } else {
+    REALLOCATE (vec[0].elements.Int, opihi_int, MAX(1, Nelements));
+    vec[0].type = OPIHI_INT;
   }
   return TRUE;
@@ -272 +251 @@
 
 // SetVector (vecx, OPIHI_FLT, MAX (Npts, 1));
-// Use this for an unallocated vector (e.g., static variable)
 int SetVector (Vector *vec, char type, int Nelements) {
 
   vec[0].Nelements = MAX(Nelements,0);
-
-  switch (type) {
-    case OPIHI_FLT:
-      ALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1,Nelements));
-      vec[0].type = OPIHI_FLT;
-      break;
-    case OPIHI_INT:
-      ALLOCATE (vec[0].elements.Int, opihi_int, MAX(1,Nelements));
-      vec[0].type = OPIHI_INT;
-      break;
-    case OPIHI_STR:
-      ALLOCATE (vec[0].elements.Ptr, char *, MAX(1,Nelements));
-      vec[0].type = OPIHI_STR;
-      break;
+  if (type == OPIHI_FLT) {
+    ALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1,Nelements));
+    vec[0].type = OPIHI_FLT;
+  } else {
+    ALLOCATE (vec[0].elements.Int, opihi_int, MAX(1,Nelements));
+    vec[0].type = OPIHI_INT;
   }
   return TRUE;
@@ -302 +272 @@
   if (vec[0].type == type) return TRUE;
 
-  switch (type) {
-    case OPIHI_FLT: {
-      opihi_flt *temp;
-      ALLOCATE (temp, opihi_flt, vec[0].Nelements);
-      opihi_flt *vo = temp;
-      opihi_int *vi = vec[0].elements.Int;
-      for (i = 0; i < vec[0].Nelements; i++, vo++, vi++) {
-        *vo = *vi;
-      }
-      free (vec[0].elements.Int);
-      vec[0].elements.Flt = temp;
-      vec[0].type = OPIHI_FLT;
-      break;
-    }
-    case OPIHI_INT: {
-      opihi_int *temp;
-      ALLOCATE (temp, opihi_int, vec[0].Nelements);
-      opihi_int *vo = temp;
-      opihi_flt *vi = vec[0].elements.Flt;
-      for (i = 0; i < vec[0].Nelements; i++, vo++, vi++) {
-        *vo = *vi;
-      }
-      free (vec[0].elements.Flt);
-      vec[0].elements.Int = temp;
-      vec[0].type = OPIHI_INT;
-      break;
-    }
-    case OPIHI_STR: 
-    default: 
-      // does it make sense to cast an int/flt vector to string?
-      break;
+  if (type == OPIHI_FLT) {
+    opihi_flt *temp;
+    ALLOCATE (temp, opihi_flt, vec[0].Nelements);
+    opihi_flt *vo = temp;
+    opihi_int *vi = vec[0].elements.Int;
+    for (i = 0; i < vec[0].Nelements; i++, vo++, vi++) {
+      *vo = *vi;
+    }
+    free (vec[0].elements.Int);
+    vec[0].elements.Flt = temp;
+    vec[0].type = OPIHI_FLT;
+  } else {
+    opihi_int *temp;
+    ALLOCATE (temp, opihi_int, vec[0].Nelements);
+    opihi_int *vo = temp;
+    opihi_flt *vi = vec[0].elements.Flt;
+    for (i = 0; i < vec[0].Nelements; i++, vo++, vi++) {
+      *vo = *vi;
+    }
+    free (vec[0].elements.Flt);
+    vec[0].elements.Int = temp;
+    vec[0].type = OPIHI_INT;
   }
   return TRUE;
@@ -381 +342 @@
   gprint (GP_LOG, "    N       name      size\n");
   for (i = 0; i < Nvectors; i++) {
-    switch (vectors[i][0].type) {
-      case OPIHI_FLT:
-        gprint (GP_LOG, "%5d %10s %10d (FLT)\n", i, vectors[i][0].name, vectors[i][0].Nelements);
-        break;
-      case OPIHI_INT:
-        gprint (GP_LOG, "%5d %10s %10d (INT)\n", i, vectors[i][0].name, vectors[i][0].Nelements);
-        break;
-      case OPIHI_STR:
-        gprint (GP_LOG, "%5d %10s %10d (STR)\n", i, vectors[i][0].name, vectors[i][0].Nelements);
-        break;
+    if (vectors[i][0].type == OPIHI_FLT) {
+      gprint (GP_LOG, "%5d %10s %10d (FLT)\n", i, vectors[i][0].name, vectors[i][0].Nelements);
+    } else {
+      gprint (GP_LOG, "%5d %10s %10d (INT)\n", i, vectors[i][0].name, vectors[i][0].Nelements);
     }
   }