[PATCH 3/6] slip: Do not malloc the userv activation context

Ian Jackson ijackson at chiark.greenend.org.uk
Mon Sep 22 16:45:10 BST 2014


This is unnecessary, as its lifetime does not exceed that of the stack
frame.

Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>
---
 slip.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/slip.c b/slip.c
index 17a9099..2d45370 100644
--- a/slip.c
+++ b/slip.c
@@ -273,7 +273,7 @@ static void userv_entry(void *sst)
 
 static void userv_invoke_userv(struct userv *st)
 {
-    struct userv_entry_rec *er;
+    struct userv_entry_rec er[1];
     int c_stdin[2];
     int c_stdout[2];
     string_t addrs;
@@ -335,8 +335,6 @@ static void userv_invoke_userv(struct userv *st)
     st->txfd=c_stdin[1];
     st->rxfd=c_stdout[0];
 
-    er=safe_malloc(sizeof(*r),"userv_invoke_userv: er");
-
     er->in=c_stdin[0];
     er->out=c_stdout[1];
     /* The arguments are:
@@ -359,7 +357,6 @@ static void userv_invoke_userv(struct userv *st)
     close(er->in);
     close(er->out);
     free(er->argv);
-    free(er);
     free(addrs);
     free(nets);
     Message(M_INFO,"%s: userv-ipif pid is %d\n",st->slip.nl.name,st->pid);
-- 
1.7.10.4




More information about the sgo-software-discuss mailing list