Changeset 15878 for trunk/Ohana/src/opihi/lib.shell/isolate_elements.c

Timestamp:

Dec 16, 2007, 2:27:00 PM (18 years ago)

Author:

eugene

Message:

fixed cases of hard-wired line length; some api cleanup in stack_math

File:

• trunk/Ohana/src/opihi/lib.shell/isolate_elements.c (modified) (7 diffs)

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

@@ -8 +8 @@
 
 /* local private static variables */
-int Nchar, Nout, NOUT;
-char **out;
+int NCHAR, Nchar, Nout, NOUT;
+char **myOutput;
 
 char **isolate_elements (int Nin, char **in, int *nout) {
@@ -17 +17 @@
   NOUT = Nin;
   Nchar = Nout = 0;
-  ALLOCATE (out, char *, NOUT);
-  ALLOCATE (out[Nout], char, NCHARS);
+  NCHAR = 256;
+  ALLOCATE (myOutput, char *, NOUT);
+  ALLOCATE (myOutput[Nout], char, NCHAR);
 
   for (i = 0; i < Nin; i++) {
@@ -35 +36 @@
         /* check previous entry on line */
         if (Nchar) {
-          OpStat = IsAnOp (out[Nout]);
-          if (out[Nout][0] == ')') OpStat = FALSE;
+          OpStat = IsAnOp (myOutput[Nout]);
+          if (myOutput[Nout][0] == ')') OpStat = FALSE;
         } else {
-          OpStat = IsAnOp (out[Nout-1]);
-          if (out[Nout-1][0] == ')') OpStat = FALSE;
+          OpStat = IsAnOp (myOutput[Nout-1]);
+          if (myOutput[Nout-1][0] == ')') OpStat = FALSE;
         }
         /* if - follows an operator, must be negator */
@@ -67 +68 @@
         /* check previous entry on line */
         if (Nchar) {
-          OpStat = IsAnOp (out[Nout]);
-          if (out[Nout][0] == ')') OpStat = FALSE;
+          OpStat = IsAnOp (myOutput[Nout]);
+          if (myOutput[Nout][0] == ')') OpStat = FALSE;
         } else {
-          OpStat = IsAnOp (out[Nout-1]);
-          if (out[Nout-1][0] == ')') OpStat = FALSE;
+          OpStat = IsAnOp (myOutput[Nout-1]);
+          if (myOutput[Nout-1][0] == ')') OpStat = FALSE;
         }
         /* if + follows an operator, must be posator */
@@ -91 +92 @@
         if (posate) continue;
         EndOfString ();
-        /* copy operator to out[Nout] */
+        /* copy operator to myOutput[Nout] */
         InsertValue (in[i][j]);
         if (negate) InsertValue ('-');
@@ -131 +132 @@
 
   /* one extra entry is allocated, free here */
-  free (out[Nout]);
+  free (myOutput[Nout]);
   *nout = Nout;
-  return (out);
+  return (myOutput);
 
 }
 
 void InsertValue (char c) {
-  out[Nout][Nchar] = c;
+  myOutput[Nout][Nchar] = c;
   Nchar ++;
-  out[Nout][Nchar] = 0;
+  if (Nchar >= NCHAR - 2) {
+    NCHAR += 256;
+    REALLOCATE (myOutput[Nout], char, NCHAR);
+  }
+  myOutput[Nout][Nchar] = 0;
 }
 
 void EndOfString () {
   if (Nchar > 0) {
-    out[Nout][Nchar] = 0;
+    myOutput[Nout][Nchar] = 0;
     Nout ++;
     Nchar = 0;
@@ -151 +156 @@
     if (Nout >= NOUT - 1) {
       NOUT += 10; 
-      REALLOCATE (out, char *, NOUT); 
+      REALLOCATE (myOutput, char *, NOUT); 
     } 
-    ALLOCATE (out[Nout], char, NCHARS); 
+    NCHAR = 256;
+    ALLOCATE (myOutput[Nout], char, NCHAR); 
   }
 }