Add function to parse additional xdot ops on top of a given xdot structure.

diff --git a/lib/xdot/xdot.c b/lib/xdot/xdot.c
index 0080b8c8410bb5159049d5302f7dfafc8e98860c..315dcfe5871f4a2762b44e1efddf3278d93a7bcc 100755 (executable)
--- a/lib/xdot/xdot.c
+++ b/lib/xdot/xdot.c
@@ -261,25 +261,35 @@ static char *parseOp(xdot_op * op, char *s, drawfunc_t ops[], int* error)
 
 #define XDBSIZE 100
 
-xdot *parseXDotF(char *s, drawfunc_t fns[], int sz)
+/* parseXDotFOn:
+ * Parse and append additional xops onto a given xdot object.
+ * Assume x != NULL.
+ * Return x.
+ */ 
+xdot *parseXDotFOn (char *s, drawfunc_t fns[], xdot* x)
 {
-    xdot *x;
     xdot_op op;
     char *ops;
-    int oldsz, bufsz = XDBSIZE;
+    int oldsz, bufsz;
     int error;
+    int initcnt, sz;
 
-    if (!s)
-       return NULL;
-    x = NEW(xdot);
-    if (sz <= sizeof(xdot_op))
-       sz = sizeof(xdot_op);
-    ops = (char *) calloc(XDBSIZE, sz);
+    if (!s || !x)
+       return x;
+
+    initcnt = x->cnt;
+    sz = x->sz;
+    if (initcnt == 0) {
+       bufsz = XDBSIZE;
+       ops = (char *) calloc(XDBSIZE, sz);
+    }
+    else {
+       ops = (char*)(x->ops);
+       bufsz = initcnt + XDBSIZE;
+       ops = (char *) realloc(ops, bufsz * sz);
+       memset(ops + (initcnt*sz), '\0', (bufsz - initcnt)*sz);
+    }
 
-    x->cnt = 0;
-    x->flags = 0;
-    x->freefunc = 0;
-    x->sz = sz;
     while ((s = parseOp(&op, s, fns, &error))) {
        if (x->cnt == bufsz) {
            oldsz = bufsz;
@@ -290,14 +300,36 @@ xdot *parseXDotF(char *s, drawfunc_t fns[], int sz)
        *(xdot_op *) (ops + (x->cnt * sz)) = op;
        x->cnt++;
     }
+    if (error)
+       x->flags |= XDOT_PARSE_ERROR;
     if (x->cnt) {
        x->ops = (xdot_op *) realloc(ops, x->cnt * sz);
-       if (error)
-           x->flags |= XDOT_PARSE_ERROR;
     }
     else {
+       free (ops);
+    }
+
+    return x;
+
+}
+
+xdot *parseXDotF(char *s, drawfunc_t fns[], int sz)
+{
+    xdot *x;
+
+    if (!s)
+       return NULL;
+    x = NEW(xdot);
+    if (sz <= sizeof(xdot_op))
+       sz = sizeof(xdot_op);
+
+    /* cnt, freefunc, ops, flags zeroed by NEW */
+    x->sz = sz;
+
+    x = parseXDotFOn (s, fns, x);
+    if (x->cnt == 0) {
        free(x);
-       x = 0;
+       x = NULL;
     }
     return x;
 }

diff --git a/lib/xdot/xdot.h b/lib/xdot/xdot.h
index 127d224a18294e0530dd09d90a858a3fde79397e..4697ae14bb7ad0c7ffbac527e9e37dba1881ceef 100755 (executable)
--- a/lib/xdot/xdot.h
+++ b/lib/xdot/xdot.h
@@ -103,6 +103,7 @@ typedef struct {
 
 /* ops are indexed by xop_kind */
 extern xdot* parseXDotF (char*, drawfunc_t opfns[], int sz);
+extern xdot* parseXDotFOn (char*, drawfunc_t opfns[], xdot*);
 extern xdot* parseXDot (char*);
 extern char* sprintXDot (xdot*);
 extern void fprintXDot (FILE*, xdot*);