aboutsummaryrefslogtreecommitdiff
path: root/coreutils/expr.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-10-19 17:01:55 +0100
committerRon Yorston <rmy@pobox.com>2016-10-19 17:01:55 +0100
commit075814c60a316cfd088c88f26f75ab21b5850b98 (patch)
treef6e33ac693630827deb309faa5fa4931588db57d /coreutils/expr.c
parent977d65c1bbc57f5cdd0c8bfd67c8b5bb1cd390dd (diff)
parentf37e1155aabde6bd95d267a8aec347cedccb8bc3 (diff)
downloadbusybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.gz
busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.bz2
busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.zip
Merge branch busybox (up to "ash: comment out free(p) just before...")
Diffstat (limited to 'coreutils/expr.c')
-rw-r--r--coreutils/expr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/expr.c b/coreutils/expr.c
index ce6b2d189..efc435443 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -114,7 +114,7 @@ static VALUE *int_value(arith_t i)
114 VALUE *v; 114 VALUE *v;
115 115
116 v = xzalloc(sizeof(VALUE)); 116 v = xzalloc(sizeof(VALUE));
117 if (INTEGER) /* otherwise xzaaloc did it already */ 117 if (INTEGER) /* otherwise xzalloc did it already */
118 v->type = INTEGER; 118 v->type = INTEGER;
119 v->u.i = i; 119 v->u.i = i;
120 return v; 120 return v;
@@ -127,7 +127,7 @@ static VALUE *str_value(const char *s)
127 VALUE *v; 127 VALUE *v;
128 128
129 v = xzalloc(sizeof(VALUE)); 129 v = xzalloc(sizeof(VALUE));
130 if (STRING) /* otherwise xzaaloc did it already */ 130 if (STRING) /* otherwise xzalloc did it already */
131 v->type = STRING; 131 v->type = STRING;
132 v->u.s = xstrdup(s); 132 v->u.s = xstrdup(s);
133 return v; 133 return v;