X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/8996f767e047eefa8af4d01b1434b54f4c169b79..e4b13205c44ec284966bfe9931ad48fed3484497:/lib.c

diff --git a/lib.c b/lib.c
index 523ca23..251d932 100644
--- a/lib.c
+++ b/lib.c
@@ -267,7 +267,7 @@ void argv_ensure(struct argv *av, size_t n)
   if (need <= av->sz) return;
   newsz = av->sz ? 2*av->sz : 8;
   while (newsz < need) newsz *= 2;
-  av->v = xrealloc(av->v - av->o, newsz*sizeof(char *)) + av->o;
+  av->v = xrealloc(av->v - av->o, newsz*sizeof(char *)); av->v += av->o;
   av->sz = newsz;
 }
 
@@ -436,7 +436,7 @@ void *treap_lookup(const struct treap *t, const char *k, size_t kn)
  * This is similar to `treap_lookup', in that it returns the requested node
  * if it already exists, or null otherwise, but it also records in P
  * information to be used by `treap_insert' to insert a new node with the
- * given key it's not there already.
+ * given key if it's not there already.
  */
 void *treap_probe(struct treap *t, const char *k, size_t kn,
 		  struct treap_path *p)
@@ -509,7 +509,7 @@ void treap_insert(struct treap *t, const struct treap_path *p,
      * subtree of U, then we rotate like this:
      *
      *			|		    |
-     *			U		    N
+     *			U		   (N)
      *		      /   \		  /   \
      *		   (N)	    Z	--->    X       U
      *		  /   \			      /   \
@@ -519,7 +519,7 @@ void treap_insert(struct treap *t, const struct treap_path *p,
      * of U, then we do the opposite rotation:
      *
      *		    |				|
-     *		    U				N
+     *		    U			       (N)
      *		  /   \			      /   \
      *		X      (N)	--->	    U	    Z
      *		      /   \		  /   \
@@ -594,7 +594,7 @@ void *treap_remove(struct treap *t, const char *k, size_t kn)
      *		      /   \		  /   \
      *		    L	    R	--->	X      (N)
      *		  /   \			      /   \
-     *		X	Y		    Y	    Z
+     *		X	Y		    Y	    R
      *
      * or
      *
@@ -608,8 +608,10 @@ void *treap_remove(struct treap *t, const char *k, size_t kn)
      * Again, these transformations clearly preserve the ordering of nodes in
      * the binary search tree, and the heap condition.
      */
-    else if (l->wt > r->wt) { *nn = l; n->left = l->right; nn = &l->right; }
-    else { *nn = r; n->right = r->left; nn = &r->left; }
+    else if (l->wt > r->wt)
+      { *nn = l; nn = &l->right; l = n->left = l->right; }
+    else
+      { *nn = r; nn = &r->left; r = n->right = r->left; }
 
   /* Release the key buffer, and return the node that we've now detached. */
   free(n->k); return (n);
@@ -691,9 +693,9 @@ void *treap_next(struct treap_iter *i)
    *
    *   * If the current node's right subtree is not empty, then the next node
    *	 to be visited is the leftmost node in that subtree.  All of the
-   *	 nodes on the stack are ancestors of the current nodes, and the right
+   *	 nodes on the stack are ancestors of the current node, and the right
    *	 subtree consists of its descendants, so none of them are already on
-   *	 the stack, and they're all greater than the current node, and
+   *	 the stack; and they're all greater than the current node, and
    *	 therefore haven't been visited.  Therefore, we must push the current
    *	 node's right child, its /left/ child, and so on, proceeding
    *	 leftwards until we fall off the bottom of the tree.
@@ -930,7 +932,7 @@ static void set_config_section_parents(struct config *conf,
      * to have, so we can allocate the `parents' vector and fill it in.
      */
     sect->nparents = av.n/2;
-    sect->parents = xmalloc(sect->nparents*sizeof(sect->parents));
+    sect->parents = xmalloc(sect->nparents*sizeof(*sect->parents));
     for (i = 0; i < av.n; i += 2) {
       n = av.v[i + 1] - av.v[i];
       parent = config_find_section_n(conf, 0, av.v[i], n);
@@ -1059,34 +1061,38 @@ struct config_var *config_find_var_n(struct config *conf,
 /* Set variable NAME to VALUE in SECT, with associated flags F.
  *
  * The names are null-terminated.  The flags are variable flags: see `struct
- * config_var' for details.
+ * config_var' for details.  Returns the variable.
  *
  * If the variable is already set and has the `CF_OVERRIDE' flag, then this
  * function does nothing unless `CF_OVERRIDE' is /also/ set in F.
  */
-void config_set_var(struct config *conf, struct config_section *sect,
-		    unsigned f, const char *name, const char *value)
+struct config_var *config_set_var(struct config *conf,
+				  struct config_section *sect,
+				  unsigned f,
+				  const char *name, const char *value)
 {
-  config_set_var_n(conf, sect, f,
-		   name, strlen(name),
-		   value, strlen(value));
+  return (config_set_var_n(conf, sect, f,
+			   name, strlen(name),
+			   value, strlen(value)));
 }
 
 /* As `config_set_var', except that the variable NAME and VALUE have explicit
  * lengths (NAMELEN and VALUELEN, respectively) rather than being null-
  * terminated.
  */
-void config_set_var_n(struct config *conf, struct config_section *sect,
-		      unsigned f,
-		      const char *name, size_t namelen,
-		      const char *value, size_t valuelen)
+struct config_var *config_set_var_n(struct config *conf,
+				    struct config_section *sect,
+				    unsigned f,
+				    const char *name, size_t namelen,
+				    const char *value, size_t valuelen)
 {
   struct config_var *var =
     config_find_var_n(conf, sect, CF_CREAT, name, namelen);
 
-  if (var->f&~f&CF_OVERRIDE) return;
+  if (var->f&~f&CF_OVERRIDE) return (var);
   free(var->val); var->val = xstrndup(value, valuelen); var->n = valuelen;
   var->f = f;
+  return (var);
 }
 
 /* Initialize I to iterate over the variables directly defined in SECT. */