Author: petdance
Date: Thu May 31 13:25:08 2007
New Revision: 18712
Modified:
trunk/src/key.c
trunk/src/misc.c
Log:
More consting, and some localizing of vars
Modified: trunk/src/key.c
==============================================================================
--- trunk/src/key.c (original)
+++ trunk/src/key.c Thu May 31 13:25:08 2007
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2003, The Perl Foundation.
+Copyright (C) 2001-2007, The Perl Foundation.
$Id$
=head1 NAME
@@ -34,7 +34,7 @@
PMC *
key_new(Interp *interp)
{
- PMC *key = pmc_new(interp, enum_class_Key);
+ PMC * const key = pmc_new(interp, enum_class_Key);
return key;
}
@@ -53,7 +53,7 @@
PMC *
key_new_integer(Interp *interp, INTVAL value)
{
- PMC *key = pmc_new(interp, enum_class_Key);
+ PMC * const key = pmc_new(interp, enum_class_Key);
PObj_get_FLAGS(key) |= KEY_integer_FLAG;
PMC_int_val(key) = value;
@@ -75,7 +75,7 @@
PMC *
key_new_number(Interp *interp, FLOATVAL value)
{
- PMC *key = pmc_new(interp, enum_class_Key);
+ PMC * const key = pmc_new(interp, enum_class_Key);
PObj_get_FLAGS(key) |= KEY_number_FLAG;
PMC_num_val(key) = value;
@@ -97,7 +97,7 @@
PMC *
key_new_string(Interp *interp, STRING *value)
{
- PMC *key = pmc_new(interp, enum_class_Key);
+ PMC * const key = pmc_new(interp, enum_class_Key);
PObj_get_FLAGS(key) |= KEY_string_FLAG;
PMC_str_val(key) = value;
@@ -138,7 +138,7 @@
PMC *
key_new_pmc(Interp *interp, PMC *value)
{
- PMC *key = pmc_new(interp, enum_class_Key);
+ PMC * const key = pmc_new(interp, enum_class_Key);
PObj_get_FLAGS(key) |= KEY_pmc_FLAG;
internal_exception(1, "this is broken - see slice.pmc");
@@ -461,9 +461,8 @@
void
key_mark(Interp *interp, PMC *key)
{
- UINTVAL flags;
+ const UINTVAL flags = PObj_get_FLAGS(key) & KEY_type_FLAGS;
- flags = PObj_get_FLAGS(key) & KEY_type_FLAGS;
if (flags == KEY_string_FLAG)
pobject_lives(interp, (PObj *)PMC_str_val(key));
/*
@@ -491,10 +490,9 @@
STRING *
key_set_to_string(Interp *interp, PMC *key)
{
- PMC *reg;
- STRING *semicolon = string_from_cstring(interp, " ; ", 3);
- STRING *quote = string_from_cstring(interp, "'", 1);
- STRING *value = string_from_cstring(interp, "[ ", 2);
+ STRING * const semicolon = string_from_cstring(interp, " ; ", 3);
+ STRING * const quote = string_from_cstring(interp, "'", 1);
+ STRING * const value = string_from_cstring(interp, "[ ", 2);
for (; key; key = (PMC *)PMC_data(key)) {
switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
@@ -518,8 +516,10 @@
string_append(interp, value, quote);
break;
case KEY_pmc_FLAG | KEY_register_FLAG:
- reg = REG_PMC(PMC_int_val(key));
+ {
+ PMC * const reg = REG_PMC(PMC_int_val(key));
string_append(interp, value, VTABLE_get_string(interp, reg));
+ }
break;
default:
string_append(interp, value, string_from_cstring(interp, "Key
type unknown", 0));
Modified: trunk/src/misc.c
==============================================================================
--- trunk/src/misc.c (original)
+++ trunk/src/misc.c Thu May 31 13:25:08 2007
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2003, The Perl Foundation.
+Copyright (C) 2001-2007, The Perl Foundation.
$Id$
=head1 NAME
@@ -84,12 +84,10 @@
Parrot_vsprintf_c(Interp *interp, const char *pat,
va_list args)
{
- STRING *realpat, *ret;
-
- realpat = string_make(interp, pat, strlen(pat),
+ STRING * const realpat = string_make(interp, pat, strlen(pat),
NULL, PObj_external_FLAG);
- ret = Parrot_vsprintf_s(interp, realpat, args);
+ STRING * const ret = Parrot_vsprintf_s(interp, realpat, args);
return ret;
}
@@ -111,12 +109,11 @@
Parrot_vsnprintf(Interp *interp, char *targ,
size_t len, const char *pat, va_list args)
{
- STRING *ret;
if (len == 0)
return;
len--;
if (len) {
- ret = Parrot_vsprintf_c(interp, pat, args);
+ const STRING * const ret = Parrot_vsprintf_c(interp, pat, args);
/* string_transcode(interp, ret, NULL, NULL, &ret); */
if (len > ret->bufused) {
