diff options
author | Bernd Schmidt <bernds_cb1@t-online.de> | 2008-06-12 10:31:17 +0000 |
---|---|---|
committer | Bernd Schmidt <bernds_cb1@t-online.de> | 2008-06-12 10:31:17 +0000 |
commit | e433ede08ba069f5100737e22eb8627187ae8f92 (patch) | |
tree | 4c4a73520537a733eed495c342951a7c0112cd51 /libc/inet/rpc | |
parent | 74d1d18f6bc7140f9bc5568b939870d8ec89b9ad (diff) |
Revert revision 19347, plus libc_hidden_proto for __uc_malloc.
Some of the code is functionally identical before and after, but for now
I'm just mechanically reverting the entire mess.
Diffstat (limited to 'libc/inet/rpc')
-rw-r--r-- | libc/inet/rpc/ruserpass.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c index 75d68dd91..ad6e703c4 100644 --- a/libc/inet/rpc/ruserpass.c +++ b/libc/inet/rpc/ruserpass.c @@ -40,7 +40,6 @@ #include <stdio_ext.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <unistd.h> /* Experimentally off - libc_hidden_proto(strcat) */ @@ -64,7 +63,6 @@ libc_hidden_proto(fopen) libc_hidden_proto(fclose) libc_hidden_proto(getc_unlocked) libc_hidden_proto(__fgetc_unlocked) -libc_hidden_proto(__uc_malloc) #define _(X) (X) /* #include "ftp_var.h" */ @@ -80,7 +78,7 @@ static FILE *cfile; #define ID 10 #define MACHINE 11 -static char *tokval; /* [100] */ +static char tokval[100]; static const char tokstr[] = { @@ -153,9 +151,6 @@ int ruserpass(const char *host, const char **aname, const char **apass) if (mydomain==NULL) { mydomain=myname + strlen(myname); } - - if (!tokval) - tokval = __uc_malloc(100); next: while ((t = token())) switch(t) { |