diff options
Diffstat (limited to 'bin/ksh/var.c')
| -rw-r--r-- | bin/ksh/var.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/bin/ksh/var.c b/bin/ksh/var.c index e43b98b3cf4..88c51a77613 100644 --- a/bin/ksh/var.c +++ b/bin/ksh/var.c @@ -1,4 +1,4 @@ -/* $OpenBSD: var.c,v 1.21 2004/12/20 11:34:26 otto Exp $ */ +/* $OpenBSD: var.c,v 1.22 2004/12/22 17:14:34 millert Exp $ */ #include "sh.h" #include <time.h> @@ -123,22 +123,22 @@ initvar(void) * non-zero if this is an array, sets *valp to the array index, returns * the basename of the array. */ -const char *array_index_calc(const char *n, bool_t *arrayp, int *valp); +const char *array_index_calc(const char *n, bool *arrayp, int *valp); const char * -array_index_calc(const char *n, bool_t *arrayp, int *valp) +array_index_calc(const char *n, bool *arrayp, int *valp) { const char *p; int len; - *arrayp = FALSE; - p = skip_varname(n, FALSE); + *arrayp = false; + p = skip_varname(n, false); if (p != n && *p == '[' && (len = array_ref_len(p))) { char *sub, *tmp; long rval; /* Calculate the value of the subscript */ - *arrayp = TRUE; + *arrayp = true; tmp = str_nsave(p+1, len-2, ATEMP); sub = substitute(tmp, 0); afree(tmp, ATEMP); @@ -162,7 +162,7 @@ global(const char *n) struct tbl *vp; int c; unsigned h; - bool_t array; + bool array; int val; /* Check to see if this is an array */ @@ -238,12 +238,12 @@ global(const char *n) * Search for local variable, if not found create locally. */ struct tbl * -local(const char *n, bool_t copy) +local(const char *n, bool copy) { struct block *l = e->loc; struct tbl *vp; unsigned h; - bool_t array; + bool array; int val; /* Check to see if this is an array */ @@ -349,7 +349,7 @@ setstr(struct tbl *vq, const char *s, int error_ok) int no_ro_check = error_ok & 0x4; error_ok &= ~0x4; if ((vq->flag & RDONLY) && !no_ro_check) { - warningf(TRUE, "%s: is read only", vq->name); + warningf(true, "%s: is read only", vq->name); if (!error_ok) errorf(null); return 0; @@ -359,7 +359,7 @@ setstr(struct tbl *vq, const char *s, int error_ok) /* debugging */ if (s >= vq->val.s && s <= vq->val.s + strlen(vq->val.s)) - internal_errorf(TRUE, + internal_errorf(true, "setstr: %s=%s: assigning to self", vq->name, s); afree((void*)vq->val.s, vq->areap); @@ -575,7 +575,7 @@ typeset(const char *var, Tflag set, Tflag clr, int field, int base) const char *val; /* check for valid variable name, search for value */ - val = skip_varname(var, FALSE); + val = skip_varname(var, false); if (val == var) return NULL; if (*val == '[') { @@ -614,7 +614,7 @@ typeset(const char *var, Tflag set, Tflag clr, int field, int base) || strcmp(tvar, "SHELL") == 0)) errorf("%s: restricted", tvar); - vp = (set&LOCAL) ? local(tvar, (set & LOCAL_COPY) ? TRUE : FALSE) + vp = (set&LOCAL) ? local(tvar, (set & LOCAL_COPY) ? true : false) : global(tvar); set &= ~(LOCAL|LOCAL_COPY); @@ -804,7 +804,7 @@ is_wdvarname(const char *s, int aok) int is_wdvarassign(const char *s) { - char *p = skip_wdvarname(s, TRUE); + char *p = skip_wdvarname(s, true); return p != s && p[0] == CHAR && p[1] == '='; } |