[svn:parrot] r38921 - in trunk: include/parrot src/string
petdance at svn.parrot.org
petdance at svn.parrot.org
Tue May 19 04:05:51 UTC 2009
Author: petdance
Date: Tue May 19 04:05:43 2009
New Revision: 38921
URL: https://trac.parrot.org/parrot/changeset/38921
Log:
dropped unused interp and return values
Modified:
trunk/include/parrot/charset.h
trunk/src/string/charset.c
Modified: trunk/include/parrot/charset.h
==============================================================================
--- trunk/include/parrot/charset.h Tue May 19 01:38:02 2009 (r38920)
+++ trunk/include/parrot/charset.h Tue May 19 04:05:43 2009 (r38921)
@@ -152,10 +152,9 @@
CHARSET * Parrot_new_charset(SHIM_INTERP);
PARROT_EXPORT
-INTVAL Parrot_register_charset(PARROT_INTERP,
+INTVAL Parrot_register_charset(SHIM_INTERP,
ARGIN(const char *charsetname),
ARGIN(CHARSET *charset))
- __attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3);
@@ -194,8 +193,7 @@
PARROT_ASSERT_ARG(charset)
#define ASSERT_ARGS_Parrot_new_charset __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
#define ASSERT_ARGS_Parrot_register_charset __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(charsetname) \
+ PARROT_ASSERT_ARG(charsetname) \
|| PARROT_ASSERT_ARG(charset)
#define ASSERT_ARGS_Parrot_register_charset_converter \
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
Modified: trunk/src/string/charset.c
==============================================================================
--- trunk/src/string/charset.c Tue May 19 01:38:02 2009 (r38920)
+++ trunk/src/string/charset.c Tue May 19 04:05:43 2009 (r38921)
@@ -66,12 +66,11 @@
static void Parrot_str_internal_register_charset_names(PARROT_INTERP)
__attribute__nonnull__(1);
-static INTVAL register_charset(PARROT_INTERP,
+static INTVAL register_charset(
ARGIN(const char *charsetname),
ARGIN(CHARSET *charset))
__attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3);
+ __attribute__nonnull__(2);
static void register_static_converters(PARROT_INTERP)
__attribute__nonnull__(1);
@@ -80,8 +79,7 @@
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
#define ASSERT_ARGS_register_charset __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(charsetname) \
+ PARROT_ASSERT_ARG(charsetname) \
|| PARROT_ASSERT_ARG(charset)
#define ASSERT_ARGS_register_static_converters __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
@@ -315,8 +313,8 @@
/*
-=item C<static INTVAL register_charset(PARROT_INTERP, const char *charsetname,
-CHARSET *charset)>
+=item C<static INTVAL register_charset(const char *charsetname, CHARSET
+*charset)>
Adds a new charset C<charset> with name <charsetname> to the list of
all charsets. Returns 0 and does nothing if a charset with that name
@@ -327,8 +325,7 @@
*/
static INTVAL
-register_charset(PARROT_INTERP, ARGIN(const char *charsetname),
- ARGIN(CHARSET *charset))
+register_charset(ARGIN(const char *charsetname), ARGIN(CHARSET *charset))
{
ASSERT_ARGS(register_charset)
int i;
@@ -433,7 +430,7 @@
PARROT_EXPORT
INTVAL
-Parrot_register_charset(PARROT_INTERP, ARGIN(const char *charsetname),
+Parrot_register_charset(SHIM_INTERP, ARGIN(const char *charsetname),
ARGIN(CHARSET *charset))
{
ASSERT_ARGS(Parrot_register_charset)
@@ -444,22 +441,22 @@
}
if (STREQ("binary", charsetname)) {
Parrot_binary_charset_ptr = charset;
- return register_charset(interp, charsetname, charset);
+ return register_charset(charsetname, charset);
}
if (STREQ("iso-8859-1", charsetname)) {
Parrot_iso_8859_1_charset_ptr = charset;
- return register_charset(interp, charsetname, charset);
+ return register_charset(charsetname, charset);
}
if (STREQ("unicode", charsetname)) {
Parrot_unicode_charset_ptr = charset;
- return register_charset(interp, charsetname, charset);
+ return register_charset(charsetname, charset);
}
if (STREQ("ascii", charsetname)) {
if (!Parrot_default_charset_ptr) {
Parrot_default_charset_ptr = charset;
}
Parrot_ascii_charset_ptr = charset;
- return register_charset(interp, charsetname, charset);
+ return register_charset(charsetname, charset);
}
return 0;
}
More information about the parrot-commits
mailing list