Re: PATCH: completion parameters etc.

[Sven Wischnowsky <wischnow@xxxxxxxxxxxxxxxxxxxxxxx>]

Peter Stephenson wrote:

> There's a stray zsfree(compcommand) in finish_comp1() in comp1.c;
> compcommand is not mentioned anywhere else any more, can I just delete it?
> Also, there's a pm_type(...) in compunsetfn in compctl.c, that should
> probably be PM_TYPE(...).

But here I could compile it... that's what you get for using
dynamically loaded modules, I guess.

Bye
 Sven

diff -u os/Zle/comp1.c Src/Zle/comp1.c
--- os/Zle/comp1.c	Mon Mar  1 13:20:06 1999
+++ Src/Zle/comp1.c	Mon Mar  1 14:28:27 1999
@@ -457,11 +457,20 @@
     deletehashtable(compctltab);
     zfree(clwords, clwsize * sizeof(char *));
     compctlreadptr = fallback_compctlread;
-    zsfree(compcontext);
-    zsfree(compcommand);
+    freearray(compwords);
     zsfree(compprefix);
-    zsfree(compiprefix);
     zsfree(compsuffix);
+    zsfree(compiprefix);
+    zsfree(compmatcherstr);
+    zsfree(compcontext);
+    zsfree(compparameter);
+    zsfree(compredirect);
+    zsfree(compquote);
+    zsfree(compquoting);
+    zsfree(comprestore);
+    zsfree(complist);
+    zsfree(compinsert);
+    zsfree(compexact);
     return 0;
 }
 
diff -u os/Zle/compctl.c Src/Zle/compctl.c
--- os/Zle/compctl.c	Mon Mar  1 13:20:06 1999
+++ Src/Zle/compctl.c	Mon Mar  1 14:26:47 1999
@@ -1960,7 +1960,7 @@
 	if (PM_TYPE(pm->flags) == PM_SCALAR) {
 	    zsfree(*((char **) pm->u.data));
 	    *((char **) pm->u.data) = ztrdup("");
-	} else if (pm_type(pm->flags) == PM_ARRAY) {
+	} else if (PM_TYPE(pm->flags) == PM_ARRAY) {
 	    freearray(*((char ***) pm->u.data));
 	    *((char ***) pm->u.data) = zcalloc(sizeof(char *));
 	}

--
Sven Wischnowsky                         wischnow@xxxxxxxxxxxxxxxxxxxxxxx