Replace btscpy with memcpy.

davidgiven · Dec 8, 2024 · c1c1d14 · c1c1d14
1 parent a5c1726
commit c1c1d14
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 40 deletions.
diff --git a/modules/src/em_opt/nopt.c b/modules/src/em_opt/nopt.c
@@ -41,9 +41,6 @@ int OO_wrstats = 1; /* pattern statistics output */
 #define printstate(s)
 #endif /* DEBUG */
 
-/**** WHICH IS FASTER? ****
- #define BTSCPY(pp,qq,i,p,q,n) btscpy(p,q,(n)*sizeof(struct e_instr))
- **************************/
 #define BTSCPY(pp,qq,i,p,q,n) for(pp=(p),qq=(q),i=(n);i--;*pp++ = *qq++)
 
 static void allocmem(void);

diff --git a/modules/src/read_em/reade.c b/modules/src/read_em/reade.c
@@ -575,7 +575,7 @@ static void line_line(void)
 	gettyp(ptyp(sp_cst2), &dummy);
 	EM_lineno = dummy.ema_cst;
 	gettyp(str_ptyp, &dummy);
-	btscpy(filebuf, dummy.ema_string, (int) dummy.ema_szoroff);
+	memcpy(filebuf, dummy.ema_string, (int) dummy.ema_szoroff);
 	EM_filename = filebuf;
 }
 

diff --git a/modules/src/string/ack_string.h b/modules/src/string/ack_string.h
@@ -8,7 +8,6 @@
 #define __ACK_STRING_INCLUDED__
 
 char *long2str(long l, int b);
-char *btscpy(char *b1, char *b2, int n);
 char *bts2str(char *b, int n, char *s);
 
 #endif /* __ACK_STRING_INCLUDED__ */
diff --git a/modules/src/string/btscpy.c b/modules/src/string/btscpy.c
diff --git a/modules/src/string/build.lua b/modules/src/string/build.lua
@@ -2,7 +2,7 @@ clibrary {
 	name = "lib",
 	srcs = {
 		"./bts2str.c",
-		"./btscpy.c","./long2str.c",
+		"./long2str.c",
 	},
 	hdrs = { "./ack_string.h", },
 }
diff --git a/modules/src/string/string.3 b/modules/src/string/string.3
@@ -1,18 +1,14 @@
 .TH STRING 3 "$Revision$"
 .ad
 .SH NAME
-strindex, strrindex, strzero, str2bts,
-long2str, str2long,
-btscpy, btscat, btscmp, btszero, bts2str \- operations on and
-conversions between strings and row of bytes
+long2str,
+bts2str \- operations on and conversions between strings and row of bytes
 .SH SYNOPSIS
 .nf
 .B #include <ack_string.h>
 .PP
 .B char *long2str(long l, int b)
 .PP
-.B char *btscpy(char *b1, char *b2, int n)
-.PP
 .B char *bts2str(char *b, int n, char *s)
 .fi
 .SH DESCRIPTION
@@ -58,16 +54,6 @@ This base may be any of 2..16.
 A negative base (in the range -16..-2) indicates that the long must be
 seen as unsigned.
 A pointer to the string is returned.
-.PP
-.I btscpy
-copies
-.I n
-bytes from the string of bytes
-.I b2
-to
-.I b1
-and returns
-.IR b1 .
 .SH FILES
 ~em/modules/lib/libstring.a
 .SH "SEE ALSO"