summary refs log tree commit diff
path: root/bin/1sh/var.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-06-07 16:34:43 -0400
committerJune McEnroe <june@causal.agency>2020-06-08 16:46:02 -0400
commit5469e127e6f872f7a61f76ccda8d96e686eae7c4 (patch)
treec2fd84d83a41dceaaede7504f19b358f60d38213 /bin/1sh/var.c
parentReplace __printflike with __attribute__((format(printf, ...))) (diff)
downloadsrc-5469e127e6f872f7a61f76ccda8d96e686eae7c4.tar.gz
src-5469e127e6f872f7a61f76ccda8d96e686eae7c4.zip
Replace __DECONST with regular casts
sed -E 's/__DECONST[(]([^,]+), ([^)]+)[)]/(\1)(\2)/'
Diffstat (limited to 'bin/1sh/var.c')
-rw-r--r--bin/1sh/var.c6
1 files changed, 3 insertions, 3 deletions
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);
 }