hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor code touch-up only

Browse Source
This commit is contained in:
hyunghwan.chung 2019-02-20 09:43:59 +00:00
parent 313077f70f
commit 1b45243b34
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moo/lib/comp.c
View File

@ -760,20 +760,6 @@ static moo_oop_t string_to_fpdec (moo_t* moo, moo_oocs_t* str, int prescaled)
moo_oow_t explen; moo_oow_t explen;
explen = len + xscale - scale; explen = len + xscale - scale;
#if 0
tmp = moo_allocmem(moo, explen * MOO_SIZEOF(*tmp));
if (!tmp)
{
const moo_ooch_t* oldmsg = moo_backuperrmsg(moo);
moo_seterrbfmt (moo, moo_geterrnum(moo), "unable to convert to fpdec %.*js - %js", str->len, str->ptr, oldmsg);
return MOO_NULL;
}
moo_copy_oochars (tmp, &str->ptr[pos], len);
moo_fill_oochars (&tmp[len], '0', explen - len);
v = moo_strtoint(moo, tmp, explen, base);
moo_freemem (moo, tmp);
#else
if (moo_copyoocharstosbuf(moo, &str->ptr[pos], len, MOO_SBUF_ID_FPDEC) <= -1 || if (moo_copyoocharstosbuf(moo, &str->ptr[pos], len, MOO_SBUF_ID_FPDEC) <= -1 ||
moo_concatoochartosbuf(moo, '0', explen - len, MOO_SBUF_ID_FPDEC) <= -1) moo_concatoochartosbuf(moo, '0', explen - len, MOO_SBUF_ID_FPDEC) <= -1)
{ {
@ -782,7 +768,6 @@ static moo_oop_t string_to_fpdec (moo_t* moo, moo_oocs_t* str, int prescaled)
return MOO_NULL; return MOO_NULL;
} }
v = moo_strtoint(moo, moo->sbuf[MOO_SBUF_ID_FPDEC].ptr, moo->sbuf[MOO_SBUF_ID_FPDEC].len, base); v = moo_strtoint(moo, moo->sbuf[MOO_SBUF_ID_FPDEC].ptr, moo->sbuf[MOO_SBUF_ID_FPDEC].len, base);
#endif
scale = xscale; scale = xscale;
} }
else if (scale > xscale) else if (scale > xscale)

17
moo/lib/utl.c
View File

@ -1128,14 +1128,14 @@ static MOO_INLINE int secure_space_in_sbuf (moo_t* moo, moo_oow_t req, moo_sbuf_
moo_oow_t newcapa; moo_oow_t newcapa;
moo_ooch_t* tmp; moo_ooch_t* tmp;
newcapa = MOO_ALIGN_POW2(p->len + req, 512); /* TODO: adjust this capacity */ newcapa = p->len + req + 1;
newcapa = MOO_ALIGN_POW2(newcapa, 512); /* TODO: adjust this capacity */
/* +1 to handle line ending injection more easily */ tmp = (moo_ooch_t*)moo_reallocmem(moo, p->ptr, newcapa * MOO_SIZEOF(*tmp));
tmp = (moo_ooch_t*)moo_reallocmem(moo, p->ptr, (newcapa + 1) * MOO_SIZEOF(*tmp));
if (!tmp) return -1; if (!tmp) return -1;
p->ptr = tmp; p->ptr = tmp;
p->capa = newcapa; p->capa = newcapa - 1;
} }
return 0; return 0;
@ -1151,23 +1151,20 @@ int moo_concatoocharstosbuf (moo_t* moo, const moo_ooch_t* ptr, moo_oow_t len, m
moo_sbuf_t* p; moo_sbuf_t* p;
p = &moo->sbuf[id]; p = &moo->sbuf[id];
if (secure_space_in_sbuf(moo, len, p) <= -1) return -1; if (secure_space_in_sbuf(moo, len, p) <= -1) return -1;
moo_copy_oochars (&p->ptr[p->len], ptr, len); moo_copy_oochars (&p->ptr[p->len], ptr, len);
p->len += len; p->len += len;
p->ptr[p->len] = '\0'; p->ptr[p->len] = '\0';
return 0; return 0;
} }
int moo_concatoochartosbuf (moo_t* moo, moo_ooch_t ch, moo_oow_t count, moo_sbuf_id_t id) int moo_concatoochartosbuf (moo_t* moo, moo_ooch_t ch, moo_oow_t count, moo_sbuf_id_t id)
{ {
moo_sbuf_t* p; moo_sbuf_t* p;
p = &moo->sbuf[id]; p = &moo->sbuf[id];
if (secure_space_in_sbuf(moo, count, p) <= -1) return -1; if (secure_space_in_sbuf(moo, count, p) <= -1) return -1;
moo_fill_oochars (&p->ptr[p->len], ch, count); moo_fill_oochars (&p->ptr[p->len], ch, count);
p->len += count; p->len += count;
p->ptr[p->len] = '\0'; p->ptr[p->len] = '\0';
@ -1177,12 +1174,12 @@ int moo_concatoochartosbuf (moo_t* moo, moo_ooch_t ch, moo_oow_t count, moo_sbuf
int moo_copyoocstrtosbuf (moo_t* moo, const moo_ooch_t* str, moo_sbuf_id_t id) int moo_copyoocstrtosbuf (moo_t* moo, const moo_ooch_t* str, moo_sbuf_id_t id)
{ {
moo->sbuf[id].len = 0;; moo->sbuf[id].len = 0;
return moo_concatoocstrtosbuf(moo, str, id); return moo_concatoocstrtosbuf(moo, str, id);
} }
int moo_copyoocharstosbuf (moo_t* moo, const moo_ooch_t* ptr, moo_oow_t len, moo_sbuf_id_t id) int moo_copyoocharstosbuf (moo_t* moo, const moo_ooch_t* ptr, moo_oow_t len, moo_sbuf_id_t id)
{ {
moo->sbuf[id].len = 0;; moo->sbuf[id].len = 0;
return moo_concatoocharstosbuf(moo, ptr, len, id); return moo_concatoocharstosbuf(moo, ptr, len, id);
} }