diff --git a/src/array.c b/src/array.c
index e7c34c9f45245e1169fe41a8b9e76768984d2f18..3203568245901d48db16f8bb6b04b18465bf2851 100644
--- a/src/array.c
+++ b/src/array.c
@@ -2255,7 +2255,7 @@ PMOD_EXPORT struct array *aggregate_array(INT32 args)
a=allocate_array_no_init(args,0);
if (args) {
- memcpy((char *)ITEM(a),(char *)(Pike_sp-args),args*sizeof(struct svalue));
+ memcpy(ITEM(a),Pike_sp-args,args*sizeof(struct svalue));
array_fix_type_field (a);
Pike_sp-=args;
DO_IF_DMALLOC(while(args--) dmalloc_touch_svalue(Pike_sp + args));
diff --git a/src/array.h b/src/array.h
index 12d6f12dd5c14596e22ccb1d9c23a464ce4cc1b2..b2f4215ca1d28642bfde87cabeb4a9a94d867959 100644
--- a/src/array.h
+++ b/src/array.h
@@ -259,8 +259,8 @@ void assign_array_level( struct array *a, struct array *b, int level );
} END_ACCEPT_UNFINISHED_TYPE_FIELDS; \
/* Unless the user does something, the type field will contain */ \
/* BIT_MIXED|BIT_UNFINISHED from the allocation above. */ \
- memcpy((char *) (ITEM(base_sval[-1].u.array) + oldsize__), \
- (char *) base_sval, diff__ * sizeof(struct svalue)); \
+ memcpy(ITEM(base_sval[-1].u.array) + oldsize__, \
+ base_sval, diff__ * sizeof(struct svalue)); \
Pike_sp = base_sval; \
} \
} while (0)
diff --git a/src/builtin.cmod b/src/builtin.cmod
index 4dafedb2a31c8b602b78909919e76c2fd37cf15b..9c1a98dd94cc105a8658de2d8792453ac692e352 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -3115,7 +3115,7 @@ PIKECLASS Buffer
str2->initial = end -= start-1;
init_string_builder_alloc (&str2->str, end, shift);
p = s->str;
- memcpy ((s = str2->str.s)->str, (char*)p+(start<<shift), end<<shift);
+ memcpy ((s = str2->str.s)->str, p+(start<<shift), end<<shift);
s->str[end<<shift] = 0; // Ensure NUL-termination
s->len = end;
if( (Pike_fp->current_object->flags & OBJECT_CLEAR_ON_EXIT) )
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 77fa452e3287536fa7fa00791ae3f52625f6964c..a163d3f0b481ac18035d7067deb59ba4ea38ccb4 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -1904,7 +1904,7 @@ PMOD_EXPORT void f_unicode_to_string(INT32 args)
* FIXME: Future optimization: Perform sufficient magic
* to do the conversion in place if the ref-count is == 1.
*/
- memcpy(out->str, (char *)(str0-len), len*2);
+ memcpy(out->str, str0-len, len*2);
} else {
/* Reverse endian */
diff --git a/src/docode.c b/src/docode.c
index 8971db960c040409014db6253508709236d484d3..a7e8b70db23bc3d636e42312569512f28ba247fc 100644
--- a/src/docode.c
+++ b/src/docode.c
@@ -173,7 +173,7 @@ static struct switch_data current_switch = {0, 0, 0, 0, 0, NULL, NULL};
void upd_int(int offset, INT32 tmp)
{
- memcpy(Pike_compiler->new_program->program+offset, (char *)&tmp,sizeof(tmp));
+ memcpy(Pike_compiler->new_program->program+offset, &tmp, sizeof(tmp));
}
INT32 read_int(int offset)
diff --git a/src/modules/SANE/sane.c b/src/modules/SANE/sane.c
index 9719b800a257bc808a8168fcfdb7f4dc4cc3f14f..ff0310d06abce5cc0b3733618ca9dcc08442211e 100644
--- a/src/modules/SANE/sane.c
+++ b/src/modules/SANE/sane.c
@@ -651,7 +651,7 @@ static void nonblocking_row_scan_callback( int fd, void *_c )
}
break;
case SANE_FRAME_RGB:
- memcpy( (char *)c->r, c->buffer, c->p.bytes_per_line );
+ memcpy( c->r, c->buffer, c->p.bytes_per_line );
break;
default:break;
}
diff --git a/src/modules/_WhiteFish/resultset.c b/src/modules/_WhiteFish/resultset.c
index b1939a27c899eace265a21ab8f637ce818f0dab9..f6d462840dd5815d435d84ab1b21826793689608 100644
--- a/src/modules/_WhiteFish/resultset.c
+++ b/src/modules/_WhiteFish/resultset.c
@@ -434,7 +434,7 @@ static void duplicate_resultset( struct object *dest,
int size = 4+4*T(src)->allocated_size*2;
T(dest)->allocated_size = T(src)->allocated_size;
T(dest)->d = malloc( size );
- memcpy( (char *)T(dest)->d, (char *)T(src)->d, size );
+ memcpy( T(dest)->d, T(src)->d, size );
}
}
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index b388fdceede30b7759adb0f8a7d35b2460f50cd6..86f692ff74cdd659b26de088444de920e7625344 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -1984,7 +1984,7 @@ int get_inet_addr(PIKE_SOCKADDR *addr,char *name,char *service, INT_TYPE port,
if(found) {
/* fprintf(stderr, "Got %d bytes (family: %d (%d))\n", */
/* addr_len, found->ai_addr->sa_family, found->ai_family); */
- memcpy((char *)addr, (char *)found->ai_addr, addr_len);
+ memcpy(addr, found->ai_addr, addr_len);
}
freeaddrinfo(res);
if(addr_len) {
@@ -2049,12 +2049,12 @@ int get_inet_addr(PIKE_SOCKADDR *addr,char *name,char *service, INT_TYPE port,
SOCKADDR_FAMILY(*addr) = ret->h_addrtype;
#ifdef HAVE_H_ADDR_LIST
- memcpy((char *)SOCKADDR_IN_ADDR(*addr),
- (char *)ret->h_addr_list[0],
+ memcpy(SOCKADDR_IN_ADDR(*addr),
+ ret->h_addr_list[0],
ret->h_length);
#else
- memcpy((char *)SOCKADDR_IN_ADDR(*addr),
- (char *)ret->h_addr,
+ memcpy(SOCKADDR_IN_ADDR(*addr),
+ ret->h_addr,
ret->h_length);
#endif
#else
diff --git a/src/pike_memory.c b/src/pike_memory.c
index c1612da65b9a2f57041fadf432ab4fff9ae90d33..91617ad995879ecfafc0f82e277f776747efedc9 100644
--- a/src/pike_memory.c
+++ b/src/pike_memory.c
@@ -3099,7 +3099,7 @@ static void dump_location_bt (LOCATION location, int indent, const char *prefix)
unsigned char *bin_base =
(unsigned char *) location + strlen (location) + 1;
unsigned int bin_len = EXTRACT_UWORD (bin_base);
- memcpy ((unsigned char *) bt, bin_base + 2, bin_len);
+ memcpy (bt, bin_base + 2, bin_len);
frames = bin_len / sizeof (c_stack_frame);
for (i = 0; i < frames; i++) {
diff --git a/src/port.c b/src/port.c
index d05c7498c60530c2c5ef690171b6206bd37b1f0a..a5250583de61ebe9bb1cc612ed0191de2d73cd67 100644
--- a/src/port.c
+++ b/src/port.c
@@ -418,21 +418,21 @@ PMOD_EXPORT int SNPRINTF(char *buf, size_t size, const char *fmt, ...)
PMOD_EXPORT unsigned INT16 EXTRACT_UWORD_(unsigned char *p)
{
unsigned INT16 a;
- memcpy((char *)&a,p,sizeof(a));
+ memcpy(&a,p,sizeof(a));
return a;
}
PMOD_EXPORT INT16 EXTRACT_WORD_(unsigned char *p)
{
INT16 a;
- memcpy((char *)&a,p,sizeof(a));
+ memcpy(&a,p,sizeof(a));
return a;
}
PMOD_EXPORT INT32 EXTRACT_INT_(unsigned char *p)
{
INT32 a;
- memcpy((char *)&a,p,sizeof(a));
+ memcpy(&a,p,sizeof(a));
return a;
}
#endif
diff --git a/src/port.h b/src/port.h
index 96bfc70faf9c8b7d5da8cac4c3aa6f07b72387a8..e02ff7e77c24339b6bcda89dbf9e0a5883ec1d79 100644
--- a/src/port.h
+++ b/src/port.h
@@ -174,7 +174,7 @@ PMOD_EXPORT int STRCASECMP(const char *a,const char *b);
#define MEMSET memset
#define HAVE_MEMCPY 1
-#define MEMCPY(X,Y,Z) memcpy((char*)(X),(char*)(Y),(Z))
+#define MEMCPY(X,Y,Z) memcpy((X),(Y),(Z))
#ifndef HAVE_MEMMOVE
PMOD_EXPORT void MEMMOVE(void *b,const void *a,size_t s);
@@ -250,21 +250,21 @@ PMOD_EXPORT INT32 EXTRACT_INT_(unsigned char *p);
/*@unused@*/ static INLINE unsigned EXTRACT_UWORD_(unsigned char *p)
{
unsigned INT16 a;
- memcpy((char *)&a,p,sizeof(a));
+ memcpy(&a,p,sizeof(a));
return a;
}
/*@unused@*/ static INLINE int EXTRACT_WORD_(unsigned char *p)
{
INT16 a;
- memcpy((char *)&a,p,sizeof(a));
+ memcpy(&a,p,sizeof(a));
return a;
}
/*@unused@*/ static INLINE INT32 EXTRACT_INT_(unsigned char *p)
{
INT32 a;
- memcpy((char *)&a,p,sizeof(a));
+ memcpy(&a,p,sizeof(a));
return a;
}
#endif
diff --git a/src/post_modules/GTK1/source/encode_truecolor.c b/src/post_modules/GTK1/source/encode_truecolor.c
index 1e201fcd6f38c4b87804d746e709f7c6b62f3ed6..1fdc7cc771eaa5f5238cbeb75592ef0400208952 100644
--- a/src/post_modules/GTK1/source/encode_truecolor.c
+++ b/src/post_modules/GTK1/source/encode_truecolor.c
@@ -40,7 +40,7 @@ static void encode_truecolor_24_rgb( rgb_group *s,
unsigned char *d,
int q, int w )
{
- memcpy(d,(unsigned char *)s,q);
+ memcpy(d,s,q);
}
static void encode_truecolor_24_rgb_al32_swapped( rgb_group *s,
@@ -71,7 +71,7 @@ static void encode_truecolor_24_rgb_al32( rgb_group *s,
{
for(l=0; l<(q/w)/3; l++)
{
- memcpy(d,(unsigned char *)s,w*3);
+ memcpy(d,s,w*3);
d += (w*3+3)&~3;
}
}
diff --git a/src/post_modules/GTK1/source/support.c b/src/post_modules/GTK1/source/support.c
index 11db3aea42b66cc59e0bed66af414bb1e4856ee6..a279912dec85075f004046c5ee0f275284f2c6ec 100644
--- a/src/post_modules/GTK1/source/support.c
+++ b/src/post_modules/GTK1/source/support.c
@@ -357,24 +357,24 @@ void pgtk_get_mapping_arg( struct mapping *map,
if(len != sizeof(char *))
Pike_fatal("oddities detected\n");
#endif
- memcpy(((char **)dest), &s->u.string->str, sizeof(char *));
+ memcpy(dest, &s->u.string->str, sizeof(char *));
break;
case PIKE_T_INT:
if(len == 2)
{
short i = (short)s->u.integer;
- memcpy(((short *)dest), &i, 2);
+ memcpy(dest, &i, 2);
}
else if(len == 4)
- memcpy(((int *)dest), &s->u.integer, len);
+ memcpy(dest, &s->u.integer, len);
break;
case PIKE_T_FLOAT:
if(len == sizeof(FLOAT_TYPE))
- memcpy(((FLOAT_TYPE *)dest), &s->u.float_number,len);
+ memcpy(dest, &s->u.float_number,len);
else if(len == sizeof(double))
{
double d = s->u.float_number;
- memcpy(((double *)dest), &d,len);
+ memcpy(dest, &d,len);
}
break;
}
diff --git a/src/post_modules/GTK2/source/encode_truecolor.c b/src/post_modules/GTK2/source/encode_truecolor.c
index a7c06bb9b11699bed5a8202166662ad114e18d99..78dbfdb2df8de5ee284b7b379854324b3d1fc9b2 100644
--- a/src/post_modules/GTK2/source/encode_truecolor.c
+++ b/src/post_modules/GTK2/source/encode_truecolor.c
@@ -40,7 +40,7 @@ static void encode_truecolor_24_rgb( rgb_group *s,
unsigned char *d,
int q, int w )
{
- memcpy(d,(unsigned char *)s,q);
+ memcpy(d,s,q);
}
static void encode_truecolor_24_rgb_al32_swapped( rgb_group *s,
@@ -71,7 +71,7 @@ static void encode_truecolor_24_rgb_al32( rgb_group *s,
{
for(l=0; l<(q/w)/3; l++)
{
- memcpy(d,(unsigned char *)s,w*3);
+ memcpy(d,s,w*3);
d += (w*3+3)&~3;
q--;
}
diff --git a/src/post_modules/GTK2/source/support.c b/src/post_modules/GTK2/source/support.c
index 9e435aa02e8fb55e561c083995b9d138652b24bd..74a192dd33d5463633ef636864c0c8ef1adb9378 100644
--- a/src/post_modules/GTK2/source/support.c
+++ b/src/post_modules/GTK2/source/support.c
@@ -348,21 +348,21 @@ void pgtk2_get_mapping_arg(struct mapping *map,
if (len!=sizeof(char *))
Pike_fatal("oddities detected\n");
#endif
- memcpy(((char **)dest),&s->u.string->str,sizeof(char *));
+ memcpy(dest,&s->u.string->str,sizeof(char *));
break;
case PIKE_T_INT:
if (len==2) {
short i=(short)s->u.integer;
- memcpy(((short *)dest),&i,2);
+ memcpy(dest,&i,2);
} else if (len==4)
- memcpy(((int *)dest),&s->u.integer,len);
+ memcpy(dest,&s->u.integer,len);
break;
case PIKE_T_FLOAT:
if (len==sizeof(FLOAT_TYPE))
- memcpy(((FLOAT_TYPE *)dest),&s->u.float_number,len);
+ memcpy(dest,&s->u.float_number,len);
else if (len==sizeof(double)) {
double d=s->u.float_number;
- memcpy(((double *)dest),&d,len);
+ memcpy(dest,&d,len);
}
break;
}
diff --git a/src/stralloc.h b/src/stralloc.h
index 09a353544d3f32d582e0491b98e7de74fb5b30e8..fbb8ab72b9db5bb211255135b7a15f21123f20c3 100644
--- a/src/stralloc.h
+++ b/src/stralloc.h
@@ -259,9 +259,9 @@ PMOD_EXPORT extern struct shared_string_location *all_shared_string_locations;
#define MAKE_CONSTANT_SHARED_STRING(var, text) \
REF_MAKE_CONST_STRING(var, text)
-#define convert_0_to_0(X,Y,Z) memcpy((char *)(X),(char *)(Y),(Z))
-#define convert_1_to_1(X,Y,Z) memcpy((char *)(X),(char *)(Y),(Z)<<1)
-#define convert_2_to_2(X,Y,Z) memcpy((char *)(X),(char *)(Y),(Z)<<2)
+#define convert_0_to_0(X,Y,Z) memcpy((X),(Y),(Z))
+#define convert_1_to_1(X,Y,Z) memcpy((X),(Y),(Z)<<1)
+#define convert_2_to_2(X,Y,Z) memcpy((X),(Y),(Z)<<2)
#define compare_0_to_0(X,Y,Z) MEMCMP((char *)(X),(char *)(Y),(Z))
#define compare_1_to_1(X,Y,Z) MEMCMP((char *)(X),(char *)(Y),(Z)<<1)
diff --git a/src/svalue.c b/src/svalue.c
index ee155af74829d885eed9aa816b6246d3dd8f3a1a..0f960b2e53b8c5c02b4adb1e29f1c9df74bcae7f 100644
--- a/src/svalue.c
+++ b/src/svalue.c
@@ -255,7 +255,7 @@ PMOD_EXPORT TYPE_FIELD assign_svalues_no_free(struct svalue *to,
TYPE_FIELD masked_type;
check_type_hint (from, num, type_hint);
- memcpy((char *)to, (char *)from, sizeof(struct svalue) * num);
+ memcpy(to, from, sizeof(struct svalue) * num);
if (!(masked_type = (type_hint & BIT_REF_TYPES)))
return type_hint;