re-add typecasts to rm warnings on discarding const (re: 97e6a52)

ksh93 · Mar 23, 2024 · a2fbf54 · a2fbf54
1 parent 97e6a52
commit a2fbf54
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/src/cmd/ksh93/bltins/cd_pwd.c b/src/cmd/ksh93/bltins/cd_pwd.c
@@ -221,7 +221,7 @@ int	b_cd(int argc, char *argv[],Shbltin_t *context)
 	if(*dp && (*dp!='.'||dp[1]) && strchr(dir,'/'))
 		sfputr(sfstdout,dir,'\n');
 	nv_putval(opwdnod,oldpwd,NV_RDONLY);
-	free(sh.pwd);
+	free((void*)sh.pwd);
 	if(*dir == '/')
 	{
 		size_t len = strlen(dir);

diff --git a/src/cmd/ksh93/bltins/whence.c b/src/cmd/ksh93/bltins/whence.c
@@ -322,7 +322,7 @@ static int whence(char **argv, int flags)
 					sfputr(sfstdout,is_pathbound_builtin ? "builtin" : "file",'\n');
 				else
 					sfputr(sfstdout,sh_fmtq(cp),'\n');
-				free(cp);
+				free((void*)cp);
 			}
 			else if(aflag<=1) 
 			{

diff --git a/src/cmd/ksh93/sh/array.c b/src/cmd/ksh93/sh/array.c
@@ -783,7 +783,7 @@ static void array_copytree(Namval_t *np, Namval_t *mp)
 	nv_offattr(np,NV_ARRAY);
 	nv_clone(np,mp,0);
 	if(np->nvalue.cp && !nv_isattr(np,NV_NOFREE))
-		free(np->nvalue.cp);
+		free((void*)np->nvalue.cp);
 	np->nvalue.cp = 0;
 	np->nvalue.up = &mp->nvalue;
 	fp->nofree  &= ~1;

diff --git a/src/cmd/ksh93/sh/name.c b/src/cmd/ksh93/sh/name.c
@@ -1666,7 +1666,7 @@ void nv_putval(Namval_t *np, const char *string, int flags)
 	if(flags&(NV_NOREF|NV_NOFREE))
 	{
 		if(np->nvalue.cp && np->nvalue.cp!=sp && !nv_isattr(np,NV_NOFREE)) 
-			free(np->nvalue.cp);
+			free((void*)np->nvalue.cp);
 		np->nvalue.cp = (char*)sp;
 		nv_setattr(np,(flags&~NV_RDONLY)|NV_NOFREE);
 		return;
@@ -1939,7 +1939,7 @@ void nv_putval(Namval_t *np, const char *string, int flags)
 				{
 					if(tofree)
 					{
-						free(tofree);
+						free((void*)tofree);
 						nv_offattr(np,NV_NOFREE);
 					}
 					up->cp = sp;
@@ -2042,7 +2042,7 @@ void nv_putval(Namval_t *np, const char *string, int flags)
 		if(flags&NV_APPEND)
 			stkseek(sh.stk,offset);
 		if(tofree && tofree!=Empty && tofree!=AltEmpty)
-			free(tofree);
+			free((void*)tofree);
 	}
 	if(!was_local && ((flags&NV_EXPORT) || nv_isattr(np,NV_EXPORT)))
 		env_change();
@@ -2484,7 +2484,7 @@ void	_nv_unset(Namval_t *np,int flags)
 	if(up && up->cp)
 	{
 		if(up->cp!=Empty && up->cp!=AltEmpty && !nv_isattr(np, NV_NOFREE))
-			free(up->cp);
+			free((void*)up->cp);
 		up->cp = 0;
 	}
 done:

diff --git a/src/cmd/ksh93/sh/nvtype.c b/src/cmd/ksh93/sh/nvtype.c
@@ -1133,7 +1133,7 @@ Namval_t *nv_mktype(Namval_t **nodes, int numnodes)
 				else if(nv_isattr(np,NV_LJUST|NV_RJUST))
 					memset((char*)nq->nvalue.cp,' ',dsize);
 				if(!j)
-					free(np->nvalue.cp);
+					free((void*)np->nvalue.cp);
 			}
 			if(!nq->nvalue.cp && nq->nvfun== &pp->childfun.fun)
 			{
@@ -1327,7 +1327,7 @@ int nv_settype(Namval_t* np, Namval_t *tp, int flags)
 		np->nvalue.up = 0;
 		nv_clone(tp,np,flags|NV_NOFREE);
 		if(np->nvalue.cp && np->nvalue.cp!=Empty && !nv_isattr(np,NV_NOFREE))
-			free(np->nvalue.cp);
+			free((void*)np->nvalue.cp);
 		np->nvalue.up = 0;
 		nofree = ap->hdr.nofree;
 		ap->hdr.nofree = 0;

diff --git a/src/cmd/ksh93/sh/path.c b/src/cmd/ksh93/sh/path.c
@@ -212,7 +212,7 @@ char *path_pwd(void)
 	{
 		if(*sh.pwd=='/')
 			return (char*)sh.pwd;
-		free(sh.pwd);
+		free((void*)sh.pwd);
 	}
 	/* First see if PWD variable is correct */
 	pwdnod = sh_scoped(PWDNOD);

diff --git a/src/cmd/ksh93/sh/subshell.c b/src/cmd/ksh93/sh/subshell.c
@@ -836,7 +836,7 @@ Sfio_t *sh_subshell(Shnode_t *t, volatile int flags, int comsub)
 		else if(sp->pwd && strcmp(sp->pwd,sh.pwd))
 			path_newdir(sh.pathlist);
 		if(sh.pwd)
-			free(sh.pwd);
+			free((void*)sh.pwd);
 		sh.pwd = sp->pwd;
 #if _lib_fchdir
 		if(sp->pwdclose)
@@ -918,7 +918,7 @@ Sfio_t *sh_subshell(Shnode_t *t, volatile int flags, int comsub)
 			case 2:
 				/* reinit PWD as it will be wrong */
 				if(sh.pwd)
-					free(sh.pwd);
+					free((void*)sh.pwd);
 				sh.pwd = NULL;
 				path_pwd();
 				errno = saveerrno;

diff --git a/src/lib/libast/hash/hashlook.c b/src/lib/libast/hash/hashlook.c
@@ -191,7 +191,7 @@ hashlook(Hash_table_t* tab, const char* name, long flags, const char* value)
 						if (name)
 						{
 							if (tab->root->local->region) (*tab->root->local->region)(tab->root->local->handle, (char*)name, 0, 0);
-							else free(name);
+							else free((void*)name);
 						}
 					}
 				}
@@ -233,7 +233,7 @@ hashlook(Hash_table_t* tab, const char* name, long flags, const char* value)
 				{
 					b->hash &= ~HASH_FREENAME;
 					if (tab->root->local->region) (*tab->root->local->region)(tab->root->local->handle, (char*)name, 0, 0);
-					else free(name);
+					else free((void*)name);
 				}
 				tab->buckets--;
 				tab->table[n] = b->next;

diff --git a/src/lib/libast/regex/regclass.c b/src/lib/libast/regex/regclass.c
@@ -228,7 +228,7 @@ regclass(const char* s, char** e)
 		cp->size = 0;
 		if (!streq(cp->name, s))
 		{
-			free(cp->name);
+			free((void*)cp->name);
 			cp->name = 0;
 		}
 	}
@@ -241,7 +241,7 @@ regclass(const char* s, char** e)
 	/* mvs.390 needs the (char*) cast -- barf */
 	if (!(cp->wtype = wctype((char*)cp->name)))
 	{
-		free(cp->name);
+		free((void*)cp->name);
 		cp->name = 0;
 		return NULL;
 	}