JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more int → unsigned

Browse Source
This commit is contained in:
tg
2013-05-02 20:23:09 +00:00
parent f0f34eb7b6
commit 0465f0a0de
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
var.c
View File

@@ -27,7 +27,7 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.171 2013/04/27 18:50:25 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/var.c,v 1.172 2013/05/02 20:23:09 tg Exp $");
/*- /*-
* Variables * Variables
@@ -347,7 +347,7 @@ str_val(struct tbl *vp)
else { else {
/* integer source */ /* integer source */
mksh_uari_t n; mksh_uari_t n;
int base; unsigned int base;
/** /**
* worst case number length is when base == 2: * worst case number length is when base == 2:
* 1 (minus) + 2 (base, up to 36) + 1 ('#') + * 1 (minus) + 2 (base, up to 36) + 1 ('#') +
@@ -361,8 +361,8 @@ str_val(struct tbl *vp)
if (vp->flag & INT_U) if (vp->flag & INT_U)
n = vp->val.u; n = vp->val.u;
else else
n = (vp->val.i < 0) ? -vp->val.i : vp->val.i; n = (vp->val.i < 0) ? -vp->val.u : vp->val.u;
base = (vp->type == 0) ? 10 : vp->type; base = (vp->type == 0) ? 10U : (unsigned int)vp->type;
if (base == 1 && n == 0) if (base == 1 && n == 0)
base = 2; base = 2;
@@ -473,8 +473,7 @@ setint(struct tbl *vq, mksh_ari_t n)
static int static int
getint(struct tbl *vp, mksh_ari_u *nump, bool arith) getint(struct tbl *vp, mksh_ari_u *nump, bool arith)
{ {
int c, base; mksh_uari_t c, num, base;
mksh_uari_t num;
const char *s; const char *s;
bool have_base = false, neg = false; bool have_base = false, neg = false;
@@ -508,8 +507,7 @@ getint(struct tbl *vp, mksh_ari_u *nump, bool arith)
} else if (c == '#') { } else if (c == '#') {
if (have_base || num < 1 || num > 36) if (have_base || num < 1 || num > 36)
return (-1); return (-1);
base = (int)num; if ((base = num) == 1) {
if (base == 1) {
unsigned int wc; unsigned int wc;
if (!UTFMODE) if (!UTFMODE)
@@ -536,7 +534,7 @@ getint(struct tbl *vp, mksh_ari_u *nump, bool arith)
c -= 'A' - 10; c -= 'A' - 10;
else else
return (-1); return (-1);
if (c < 0 || c >= base) if (c >= base)
return (-1); return (-1);
num = num * base + c; num = num * base + c;
} }