mirror of
https://github.com/sheumann/hush.git
synced 2024-12-21 23:29:34 +00:00
*: use {i,u}toa() where appropriate
function old new delta startservice 377 363 -14 setari_u 54 40 -14 ash_main 1375 1361 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-42) Total: -42 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
8d680b5114
commit
7bb346f23c
@ -147,7 +147,7 @@ int cal_main(int argc, char **argv)
|
|||||||
unsigned *dp;
|
unsigned *dp;
|
||||||
char lineout[80];
|
char lineout[80];
|
||||||
|
|
||||||
sprintf(lineout, "%d", year);
|
sprintf(lineout, "%u", year);
|
||||||
center(lineout,
|
center(lineout,
|
||||||
(WEEK_LEN * 3 + HEAD_SEP * 2)
|
(WEEK_LEN * 3 + HEAD_SEP * 2)
|
||||||
+ julian * (J_WEEK_LEN * 2 + HEAD_SEP
|
+ julian * (J_WEEK_LEN * 2 + HEAD_SEP
|
||||||
|
@ -765,11 +765,9 @@ static var *setvar_u(var *v, const char *value)
|
|||||||
/* set array element to user string */
|
/* set array element to user string */
|
||||||
static void setari_u(var *a, int idx, const char *s)
|
static void setari_u(var *a, int idx, const char *s)
|
||||||
{
|
{
|
||||||
char sidx[sizeof(int)*3 + 1];
|
|
||||||
var *v;
|
var *v;
|
||||||
|
|
||||||
sprintf(sidx, "%d", idx);
|
v = findvar(iamarray(a), itoa(idx));
|
||||||
v = findvar(iamarray(a), sidx);
|
|
||||||
setvar_u(v, s);
|
setvar_u(v, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -391,9 +391,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
num = atoi(num_buf);
|
num = atoi(num_buf);
|
||||||
if (isdigit(num_buf[0]) && (num <= 100)) {
|
if (isdigit(num_buf[0]) && (num <= 100)) {
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
char strVal[10];
|
DEBUG_MESSAGE(itoa(num));
|
||||||
sprintf(strVal, "%d", num);
|
|
||||||
DEBUG_MESSAGE(strVal);
|
|
||||||
#endif
|
#endif
|
||||||
fb_drawprogressbar(num);
|
fb_drawprogressbar(num);
|
||||||
}
|
}
|
||||||
|
@ -311,7 +311,6 @@ static void startservice(struct svdir *s)
|
|||||||
int p;
|
int p;
|
||||||
const char *arg[4];
|
const char *arg[4];
|
||||||
char exitcode[sizeof(int)*3 + 2];
|
char exitcode[sizeof(int)*3 + 2];
|
||||||
char sigcode[sizeof(int)*3 + 2];
|
|
||||||
|
|
||||||
if (s->state == S_FINISH) {
|
if (s->state == S_FINISH) {
|
||||||
/* Two arguments are given to ./finish. The first one is ./run exit code,
|
/* Two arguments are given to ./finish. The first one is ./run exit code,
|
||||||
@ -324,13 +323,12 @@ static void startservice(struct svdir *s)
|
|||||||
arg[0] = "./finish";
|
arg[0] = "./finish";
|
||||||
arg[1] = "-1";
|
arg[1] = "-1";
|
||||||
if (WIFEXITED(s->wstat)) {
|
if (WIFEXITED(s->wstat)) {
|
||||||
sprintf(exitcode, "%u", (int) WEXITSTATUS(s->wstat));
|
*utoa_to_buf(WEXITSTATUS(s->wstat), exitcode, sizeof(exitcode)) = '\0';
|
||||||
arg[1] = exitcode;
|
arg[1] = exitcode;
|
||||||
}
|
}
|
||||||
//arg[2] = "0";
|
//arg[2] = "0";
|
||||||
//if (WIFSIGNALED(s->wstat)) {
|
//if (WIFSIGNALED(s->wstat)) {
|
||||||
sprintf(sigcode, "%u", (int) WTERMSIG(s->wstat));
|
arg[2] = utoa(WTERMSIG(s->wstat));
|
||||||
arg[2] = sigcode;
|
|
||||||
//}
|
//}
|
||||||
arg[3] = NULL;
|
arg[3] = NULL;
|
||||||
} else {
|
} else {
|
||||||
|
@ -13083,7 +13083,6 @@ init(void)
|
|||||||
/* from var.c: */
|
/* from var.c: */
|
||||||
{
|
{
|
||||||
char **envp;
|
char **envp;
|
||||||
char ppid[sizeof(int)*3 + 2];
|
|
||||||
const char *p;
|
const char *p;
|
||||||
struct stat st1, st2;
|
struct stat st1, st2;
|
||||||
|
|
||||||
@ -13094,8 +13093,7 @@ init(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(ppid, "%u", (unsigned) getppid());
|
setvar("PPID", utoa(getppid()), 0);
|
||||||
setvar("PPID", ppid, 0);
|
|
||||||
|
|
||||||
p = lookupvar("PWD");
|
p = lookupvar("PWD");
|
||||||
if (p)
|
if (p)
|
||||||
|
Loading…
Reference in New Issue
Block a user