Supplement: Fixup some more compat prototypes

FDOS · Aug 31, 2022 · 5f018a4 · 5f018a4 · ryojiang · Dec 19, 2024
1 parent 83fd61d
commit 5f018a4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/suppl/fmemory.h b/suppl/fmemory.h
@@ -54,13 +54,13 @@ void far *_fmemset(void far * const dst, int ch, unsigned length);
 
 unsigned _fstrlen(const char far * const s);
 char far *_fstrchr(const char far * const s, int ch);
-char far *_fmemchr(const char far * const s, int ch, unsigned length);
+void far *_fmemchr(const void far * s, int ch, unsigned length);
 void far *_fmemmove(void far * const dst, const void far * const src, unsigned length);
 int _fmemcmp(const void far * const dst, const void far * const src, unsigned length);
 int _fmemicmp(const void far * const dst, const void far * const src, unsigned length);
 int _fstrcmp(const char far * const dst, const char far * const src);
 int _fstricmp(const char far * const dst, const char far * const src);
-void _fstrcpy(char far * const dst, const char far * const src);
+char far *_fstrcpy(char far * dst, const char far * src);
 
 #endif /* defined(_PAC_NOCLIB_) || defined(_TC_EARLY_) || defined(__GNUC__) */
 #endif		/* _TC_LATER_ */

diff --git a/suppl/src/fmemchr.c b/suppl/src/fmemchr.c
@@ -61,12 +61,12 @@ unsigned _fmemchr(unsigned const seg, unsigned ofs, const unsigned value, unsign
 #include <portable.h>
 #include "fmemory.h"
 
-char far *_fmemchr(const char far* const s, int ch, unsigned length)
+void far *_fmemchr(const void far * s, int ch, unsigned length)
 {	const byte far *p;
 
 	for(p = (const byte far*)s; length--; ++p)
 		if(*p == ch)
-			return (char far*)p;
+			return (void far*)p;
 
 	return 0;
 }

diff --git a/suppl/src/fstrcpy.c b/suppl/src/fstrcpy.c
@@ -40,7 +40,8 @@ co(mpilers): Micro-C only
 #include "fmemory.loc"
 
 #ifdef COMPILE
-void _fstrcpy(fargDecl(char, dst), fargDecl(const char, src))
-{	_fmemcpy(fargPass(dst), fargPass(src), _fstrlen1(src));
+char far *_fstrcpy(fargDecl(char, dst), fargDecl(const char, src))
+{
+	return (char far *)_fmemcpy(fargPass(dst), fargPass(src), _fstrlen1(src));
 }
 #endif