diff options
| author | June McEnroe <june@causal.agency> | 2020-06-07 16:34:43 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-06-08 16:46:02 -0400 |
| commit | 5469e127e6f872f7a61f76ccda8d96e686eae7c4 (patch) | |
| tree | c2fd84d83a41dceaaede7504f19b358f60d38213 /bin/1sh | |
| parent | Replace __printflike with __attribute__((format(printf, ...))) (diff) | |
| download | src-5469e127e6f872f7a61f76ccda8d96e686eae7c4.tar.gz src-5469e127e6f872f7a61f76ccda8d96e686eae7c4.zip | |
Replace __DECONST with regular casts
sed -E 's/__DECONST[(]([^,]+), ([^)]+)[)]/(\1)(\2)/'
Diffstat (limited to 'bin/1sh')
| -rw-r--r-- | bin/1sh/exec.c | 2 | ||||
| -rw-r--r-- | bin/1sh/histedit.c | 2 | ||||
| -rw-r--r-- | bin/1sh/var.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bin/1sh/exec.c b/bin/1sh/exec.c index 985fbdeb..81efa565 100644 --- a/bin/1sh/exec.c +++ b/bin/1sh/exec.c @@ -165,7 +165,7 @@ tryexec(char *cmd, char **argv, char **envp) } } *argv = cmd; - *--argv = __DECONST(char *, _PATH_BSHELL); + *--argv = (char *)(_PATH_BSHELL); execve(_PATH_BSHELL, argv, envp); } errno = e; diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c index 437cb15c..e0bda06e 100644 --- a/bin/1sh/histedit.c +++ b/bin/1sh/histedit.c @@ -525,7 +525,7 @@ bindcmd(int argc, char **argv) el_get(el, EL_GETFP, 1, &old); el_set(el, EL_SETFP, 1, out); - ret = el_parse(el, argc, __DECONST(const char **, argv)); + ret = el_parse(el, argc, (const char **)(argv)); el_set(el, EL_SETFP, 1, old); diff --git a/bin/1sh/var.c b/bin/1sh/var.c index 23c56943..44742169 100644 --- a/bin/1sh/var.c +++ b/bin/1sh/var.c @@ -181,7 +181,7 @@ initvar(void) continue; vp->next = *vpp; *vpp = vp; - vp->text = __DECONST(char *, ip->text); + vp->text = (char *)(ip->text); vp->flags = ip->flags | VSTRFIXED | VTEXTFIXED; vp->func = ip->func; } @@ -191,7 +191,7 @@ initvar(void) if (find_var("PS1", &vpp, &vps1.name_len) == NULL) { vps1.next = *vpp; *vpp = &vps1; - vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); + vps1.text = (char *)(geteuid() ? "PS1=$ " : "PS1=# "); vps1.flags = VSTRFIXED|VTEXTFIXED; } fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); @@ -411,7 +411,7 @@ setvareq(char *s, int flags) static void setvareq_const(const char *s, int flags) { - setvareq(__DECONST(char *, s), flags | VTEXTFIXED); + setvareq((char *)(s), flags | VTEXTFIXED); } |