nishiTV/sj3
1
0
Fork 0
Code Pull requests Activity

Fix -Wincompatible-pointer-types

Browse source 
Signed-off-by: Masanori Ogino <mogino@acm.org>
This commit is contained in:
SASANO Takayoshi 2023-11-30 06:12:31 +09:00 • committed by Masanori Ogino
commit 19da67071b
1 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

49
sj3lib/level1.c
View file

@ -162,21 +162,22 @@ put_cmd(int cmd)
#define put_string put_ndata
static u_char*
put_ndata(u_char* p, int n)
static u_char *
put_ndata(void *p, int n)
{
while (n-- > 0) put_byte(p ? *p++ : 0);
return p;
u_char *pp = (u_char *)p;
while (n-- > 0)
put_byte(pp ? *pp++ : 0);
return pp;
}
static int
put_over(
int buflen,
int n,
u_char* (*func1)(), u_char* str1, int len1,
u_char* (*func2)(), u_char* str2, int len2,
u_char* (*func3)(), u_char* str3, int len3,
u_char* (*func4)(), u_char* str4, int len4)
put_over(int buflen, int n,
u_char *(*func1)(), void *str1, int len1,
u_char *(*func2)(), void *str2, int len2,
u_char *(*func3)(), void *str3, int len3,
u_char *(*func4)(), void *str4, int len4)
{
#define ARGNUM 4
u_char *(*func[ARGNUM])();
@ -184,10 +185,18 @@ put_over(
int len[ARGNUM];
int i;
func[0] = func1; data[0] = str1; len[0] = len1;
func[1] = func2; data[1] = str2; len[1] = len2;
func[2] = func3; data[2] = str3; len[2] = len3;
func[3] = func4; data[3] = str4; len[3] = len4;
func[0] = func1;
data[0] = (u_char *)str1;
len[0] = len1;
func[1] = func2;
data[1] = (u_char *)str2;
len[1] = len2;
func[2] = func3;
data[2] = (u_char *)str3;
len[2] = len3;
func[3] = func4;
data[3] = (u_char *)str4;
len[3] = len4;
for(i = 0; i < n; i++) {
if (len[i] < buflen) {
@ -287,11 +296,13 @@ get_nstring(u_char* p, int n)
return n;
}
static u_char*
get_ndata(u_char* p, int n)
static u_char *
get_ndata(void *p, int n)
{
while (n-- > 0) *p++ = get_byte();
return p;
u_char *pp = (u_char *)p;
while (n-- > 0)
*pp++ = get_byte();
return pp;
}
static void