Skip to content

Commit

Permalink
Merge branch 'master' of github.com:parrot/parrot
Browse files Browse the repository at this point in the history
  • Loading branch information
bacek committed Jan 6, 2011
2 parents d8405fa + 2369288 commit e5b39b7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
5 changes: 1 addition & 4 deletions src/debug.c
Expand Up @@ -3284,12 +3284,9 @@ STRING *
Parrot_dbg_get_exception_backtrace(PARROT_INTERP, ARGMOD(PMC * exception))
{
ASSERT_ARGS(Parrot_dbg_get_exception_backtrace)
STRING *str;
PMC *old = PMCNULL;
int rec_level = 0;
int limit_count = 0;

PMC * const ctx = get_exception_context(interp, exception);

if (PMC_IS_NULL(ctx))
return STRINGNULL;
else {
Expand Down
1 change: 0 additions & 1 deletion src/interp/inter_cb.c
Expand Up @@ -286,7 +286,6 @@ Parrot_run_callback(PARROT_INTERP,
PMC *signature;
PMC *sub;
STRING *sig_str;
char *p;
INTVAL ch;
char pasm_sig[5];
INTVAL i_param;
Expand Down
2 changes: 1 addition & 1 deletion src/string/api.c
Expand Up @@ -2619,7 +2619,7 @@ Parrot_str_unescape(PARROT_INTERP,
{
ASSERT_ARGS(Parrot_str_unescape)

STRING *src, *result;
STRING *src;
const STR_VTABLE *encoding, *src_encoding;

/* does the encoding have a character set? */
Expand Down

0 comments on commit e5b39b7

Please sign in to comment.