Rip out Salloc() and replace it with strdup().

tkchia · Dec 8, 2024 · a5c1726 · a5c1726
1 parent 424dabd
commit a5c1726
Show file tree

Hide file tree

Showing 40 changed files with 659 additions and 623 deletions.
diff --git a/lang/cem/cemcom.ansi/LLlex.c b/lang/cem/cemcom.ansi/LLlex.c
@@ -8,6 +8,7 @@
 #include <assert.h>
 #include <alloc.h>
 #include <stdlib.h>
+#include <string.h>
 #include "parameters.h"
 #include "input.h"
 #include "arith.h"
@@ -363,7 +364,7 @@ int GetToken(struct token* ptok)
 				if ((flags & FLG_DOTSEEN)
 				    || (flags & FLG_ESEEN && !(ch == '0' && (*np == 'x' || *np == 'X'))))
 				{
-					ptok->tk_fval = Salloc("0.0", (unsigned)4);
+					ptok->tk_fval = strdup("0.0");
 					ptok->tk_fund = DOUBLE;
 					return ptok->tk_symb = FLOATING;
 				}
@@ -584,11 +585,11 @@ static void strflt2tok(char fltbuf[], struct token* ptok)
 	if (malformed)
 	{
 		lexerror("malformed floating constant");
-		ptok->tk_fval = Salloc("0.0", (unsigned)4);
+		ptok->tk_fval = strdup("0.0");
 	}
 	else
 	{
-		ptok->tk_fval = Salloc(fltbuf, (unsigned)(cp - fltbuf + 1));
+		ptok->tk_fval = strdup(fltbuf);
 	}
 }
 

diff --git a/lang/cem/cemcom.ansi/LLmessage.c b/lang/cem/cemcom.ansi/LLmessage.c
@@ -5,6 +5,7 @@
 /* $Id$ */
 /*		PARSER ERROR ADMINISTRATION		*/
 
+#include	<string.h>
 #include	<alloc.h>
 #include	"idf.h"
 #include	"arith.h"
@@ -57,15 +58,15 @@ static void insert_token(int tk)
 		dot.tk_idf = str2idf("int", 0);
 		break;
 	case STRING:
-		dot.tk_bts = Salloc("", 1);
+		dot.tk_bts = strdup("");
 		dot.tk_len = 1;
 		break;
 	case INTEGER:
 		dot.tk_fund = INT;
 		dot.tk_ival = 1;
 		break;
 	case FLOATING:
-		dot.tk_fval = Salloc("0.0", 4);
+		dot.tk_fval = strdup("0.0");
 		break;
 	}
 }
diff --git a/lang/cem/cemcom.ansi/main.c b/lang/cem/cemcom.ansi/main.c
@@ -164,7 +164,7 @@ void compile(int argc, char *argv[])
 		FileName = source = argv[0];
 	else {
 		source = 0;
-		FileName = Salloc("standard input", (unsigned) 16);
+		FileName = strdup("standard input");
 	}
 
 	if (!InsertFile(source, (char **) 0, &result)) /* read the source file	*/

diff --git a/lang/cem/cemcom/LLlex.c b/lang/cem/cemcom/LLlex.c
@@ -422,10 +422,10 @@ GetToken(ptok)
 		buf[0] = '-';	/* good heavens...	*/
 		if (np == &buf[NUMSIZE+1]) {
 			lexerror("floating constant too long");
-			ptok->tk_fval = Salloc("-0.0",(unsigned) 5) + 1;
+			ptok->tk_fval = strdup("-0.0") + 1;
 		}
 		else
-			ptok->tk_fval = Salloc(buf,(unsigned) (np - buf)) + 1;
+			ptok->tk_fval = strdup(buf) + 1;
 		return ptok->tk_symb = FLOATING;
 #endif /* NOFLOAT */
 	}

diff --git a/lang/cem/cemcom/LLmessage.c b/lang/cem/cemcom/LLmessage.c
@@ -51,7 +51,7 @@ insert_token(tk)
 		dot.tk_idf = str2idf("int");
 		break;
 	case STRING:
-		dot.tk_bts = Salloc("", 1);
+		dot.tk_bts = strdup("");
 		dot.tk_len = 1;
 		break;
 	case INTEGER:
@@ -60,7 +60,7 @@ insert_token(tk)
 		break;
 #ifndef NOFLOAT
 	case FLOATING:
-		dot.tk_fval = Salloc("0.0", 4);
+		dot.tk_fval = strdup("0.0");
 		break;
 #endif /* NOFLOAT */
 	}

diff --git a/lang/cem/cemcom/arith.c b/lang/cem/cemcom/arith.c
@@ -286,7 +286,7 @@ int2float(expp, tp)
 		exp = *expp;
 		exp->ex_type = tp;
 		exp->ex_class = Float;
-		exp->FL_VALUE = Salloc(buf, (unsigned)strlen(buf)+2) + 1;
+		exp->FL_VALUE = strdup(buf) + 1;
 		exp->FL_DATLAB = 0;
 	}
 	else	*expp = arith2arith(tp, INT2FLOAT, *expp);

diff --git a/lang/cem/cemcom/idf.c b/lang/cem/cemcom/idf.c
@@ -91,7 +91,7 @@ idf_hashed(tg, size, hc)
 	notch = new_idf();
 	notch->next = *hook;
 	*hook = notch;		/* hooked in */
-	notch->id_text = Salloc(tg, (unsigned) size);
+	notch->id_text = strdup(tg);
 #ifndef NOPP
 	notch->id_resmac = 0;
 #endif /* NOPP */

diff --git a/lang/cem/cemcom/input.c b/lang/cem/cemcom/input.c
@@ -43,7 +43,7 @@ getwdir(fn)
 		return "";
 	if (p) {
 		*p = '\0';
-		fn = Salloc(fn, p - &fn[0] + 1);
+		fn = strdup(fn);
 		*p = '/';
 		return fn;
 	}

diff --git a/lang/cem/cpp.ansi/input.c b/lang/cem/cpp.ansi/input.c
@@ -36,7 +36,7 @@ char* getwdir(char* fn)
 	if (p)
 	{
 		*p = '\0';
-		fn = Salloc(fn, (unsigned)(p - &fn[0] + 1));
+		fn = strdup(fn);
 		*p = '/';
 		return fn;
 	}

diff --git a/lang/cem/cpp.ansi/options.c b/lang/cem/cpp.ansi/options.c
@@ -73,12 +73,12 @@ void do_option(char *text)
 			++cp;
 		if (!*cp) {			/* -Dname */
 			maclen = 1;
-			mactext = Salloc("1", 2);
+			mactext = strdup("1");
 		} else
 		if (*cp == '=')	{		/* -Dname=text	*/
 			*cp++ = '\0';		/* end of name	*/
 			maclen = strlen(cp);
-			mactext = Salloc(cp, maclen + 1);
+			mactext = strdup(cp);
 		}
 		else	{			/* -Dname?? */
 			error("malformed option -D%s", text);