diff options
Diffstat (limited to 'src/cmd/rc/var.c')
| -rw-r--r-- | src/cmd/rc/var.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/cmd/rc/var.c b/src/cmd/rc/var.c index e2d3e08..f67e8e3 100644 --- a/src/cmd/rc/var.c +++ b/src/cmd/rc/var.c @@ -18,8 +18,7 @@ static struct Keyword keywords[100]; // sparse map means less hits // ----------------------------------------------------------------------- // internals -static -int +static int hash(char *s, int len) { int h =0, i = 1; @@ -30,8 +29,7 @@ hash(char *s, int len) return h < 0 ? h+len : h; } -static -void +static void ·setvar(char *name, Word *val, int call) { Var *v = var(name); @@ -44,8 +42,7 @@ void v->update(v); } -static -char* +static char* list2strcolon(Word *words) { char *value, *s, *t; @@ -70,8 +67,7 @@ list2strcolon(Word *words) return value; } -static -void +static void littlepath(Var *v) { /* convert $path to $PATH */ @@ -86,8 +82,7 @@ littlepath(Var *v) ·setvar("PATH", w, 1); } -static -void +static void bigpath(Var *v) { /* convert $PATH to $path */ @@ -103,7 +98,7 @@ bigpath(Var *v) w = nil; l = &w; - /* Doesn't handle escaped colon nonsense. */ + /* we don't handle escaped colons */ if(p[0] == 0) p = nil; @@ -195,13 +190,6 @@ var(char *name) return globalvar(name); } -static -int -cmpenv(const void *a, const void *b) -{ - return strcmp(*(char**)a, *(char**)b); -} - char** mkenv(void) { @@ -218,7 +206,7 @@ mkenv(void) nchr+=strlen(a->str)+1; \ } - for(v= runner->local; v; v=v->link){ + for(v = runner->local; v; v=v->link){ BODY } for(h=globals; h!=arrend(globals); h++){ @@ -262,8 +250,8 @@ mkenv(void) *ep=0; - qsort((char *)env, nvar, sizeof ep[0], cmpenv); - return env; + sort·string(nvar, env); + return env; } void |