Author: petdance
Date: Mon Jun 18 23:18:28 2007
New Revision: 19119
Modified:
branches/awaiting-0.4.13/src/charset/ascii.c
branches/awaiting-0.4.13/src/charset/binary.c
branches/awaiting-0.4.13/src/charset/iso-8859-1.c
branches/awaiting-0.4.13/src/charset/unicode.c
branches/awaiting-0.4.13/src/encodings/fixed_8.c
branches/awaiting-0.4.13/src/encodings/ucs2.c
branches/awaiting-0.4.13/src/encodings/utf16.c
branches/awaiting-0.4.13/src/vtables.c
Log:
Use direct struct assignment instead of memcpy and sizeof
Modified: branches/awaiting-0.4.13/src/charset/ascii.c
==============================================================================
--- branches/awaiting-0.4.13/src/charset/ascii.c (original)
+++ branches/awaiting-0.4.13/src/charset/ascii.c Mon Jun 18 23:18:28 2007
@@ -434,7 +434,7 @@
NULL
};
- memcpy(return_set, &base_set, sizeof (CHARSET));
+ *return_set = base_set;
return_set->preferred_encoding = Parrot_fixed_8_encoding_ptr;
Parrot_register_charset(interp, "ascii", return_set);
return return_set;
Modified: branches/awaiting-0.4.13/src/charset/binary.c
==============================================================================
--- branches/awaiting-0.4.13/src/charset/binary.c (original)
+++ branches/awaiting-0.4.13/src/charset/binary.c Mon Jun 18 23:18:28 2007
@@ -188,7 +188,7 @@
NULL
};
- memcpy(return_set, &base_set, sizeof (CHARSET));
+ *return_set = base_set;
return_set->preferred_encoding = Parrot_fixed_8_encoding_ptr;
Parrot_register_charset(interp, "binary", return_set);
return return_set;
Modified: branches/awaiting-0.4.13/src/charset/iso-8859-1.c
==============================================================================
--- branches/awaiting-0.4.13/src/charset/iso-8859-1.c (original)
+++ branches/awaiting-0.4.13/src/charset/iso-8859-1.c Mon Jun 18 23:18:28 2007
@@ -353,7 +353,7 @@
NULL
};
- memcpy(return_set, &base_set, sizeof (CHARSET));
+ *return_set = base_set;
return_set->preferred_encoding = Parrot_fixed_8_encoding_ptr;
Parrot_register_charset(interp, "iso-8859-1", return_set);
return return_set;
Modified: branches/awaiting-0.4.13/src/charset/unicode.c
==============================================================================
--- branches/awaiting-0.4.13/src/charset/unicode.c (original)
+++ branches/awaiting-0.4.13/src/charset/unicode.c Mon Jun 18 23:18:28 2007
@@ -558,7 +558,7 @@
NULL
};
- memcpy(return_set, &base_set, sizeof (CHARSET));
+ *return_set = base_set;
/*
* for now use utf8
* TODO replace it with a fixed uint_16 or uint_32 encoding
Modified: branches/awaiting-0.4.13/src/encodings/fixed_8.c
==============================================================================
--- branches/awaiting-0.4.13/src/encodings/fixed_8.c (original)
+++ branches/awaiting-0.4.13/src/encodings/fixed_8.c Mon Jun 18 23:18:28 2007
@@ -59,7 +59,7 @@
static UINTVAL
get_byte(Interp *interp, const STRING *source_string, UINTVAL offset)
{
- unsigned char *contents = (unsigned char *)source_string->strstart;
+ const unsigned char *contents = (const unsigned char
*)source_string->strstart;
if (offset >= source_string->bufused) {
/* internal_exception(0,
"get_byte past the end of the buffer (%i of %i)",
@@ -234,7 +234,7 @@
iter_init
};
- memcpy(return_encoding, &base_encoding, sizeof (ENCODING));
+ *return_encoding = base_encoding;
Parrot_register_encoding(interp, "fixed_8", return_encoding);
return return_encoding;
}
Modified: branches/awaiting-0.4.13/src/encodings/ucs2.c
==============================================================================
--- branches/awaiting-0.4.13/src/encodings/ucs2.c (original)
+++ branches/awaiting-0.4.13/src/encodings/ucs2.c Mon Jun 18 23:18:28 2007
@@ -253,7 +253,7 @@
bytes,
iter_init
};
- memcpy(return_encoding, &base_encoding, sizeof (ENCODING));
+ *return_encoding = base_encoding;
Parrot_register_encoding(interp, "ucs2", return_encoding);
return return_encoding;
}
Modified: branches/awaiting-0.4.13/src/encodings/utf16.c
==============================================================================
--- branches/awaiting-0.4.13/src/encodings/utf16.c (original)
+++ branches/awaiting-0.4.13/src/encodings/utf16.c Mon Jun 18 23:18:28 2007
@@ -339,7 +339,7 @@
ENCODING *
Parrot_encoding_utf16_init(Interp *interp)
{
- ENCODING *return_encoding = Parrot_new_encoding(interp);
+ ENCODING * const return_encoding = Parrot_new_encoding(interp);
static const ENCODING base_encoding = {
"utf16",
@@ -360,7 +360,7 @@
bytes,
iter_init
};
- memcpy(return_encoding, &base_encoding, sizeof (ENCODING));
+ *return_encoding = base_encoding;
Parrot_register_encoding(interp, "utf16", return_encoding);
return return_encoding;
}
Modified: branches/awaiting-0.4.13/src/vtables.c
==============================================================================
--- branches/awaiting-0.4.13/src/vtables.c (original)
+++ branches/awaiting-0.4.13/src/vtables.c Mon Jun 18 23:18:28 2007
@@ -48,7 +48,7 @@
{
VTABLE * const new_vtable = mem_allocate_typed(VTABLE);
if (new_vtable) {
- memcpy(new_vtable, base_vtable, sizeof (VTABLE));
+ *new_table = *base_vtable;
}
return new_vtable;
}
