[svn:parrot] r40203 - in trunk: . include/parrot src/string

[bacek at svn.parrot.org]

Author: bacek
Date: Tue Jul 21 23:08:57 2009
New Revision: 40203
URL: https://trac.parrot.org/parrot/changeset/40203

Log:
[cage] Remove deprecated Parrot_str_free function

Modified:
   trunk/DEPRECATED.pod
   trunk/include/parrot/string_funcs.h
   trunk/src/string/api.c

Modified: trunk/DEPRECATED.pod
==============================================================================
--- trunk/DEPRECATED.pod	Tue Jul 21 22:40:22 2009	(r40202)
+++ trunk/DEPRECATED.pod	Tue Jul 21 23:08:57 2009	(r40203)
@@ -239,13 +239,6 @@
 
 * = item may be kept but reimplemented.
 
-=item Parrot_str_free [eligible in 1.5]
-
-L<https://trac.parrot.org/parrot/ticket/826>
-
-This function was an attempt of optimization, but is error prone. Let the
-garbage collector take care.
-
 =back
 
 =head1 Compiler tools

Modified: trunk/include/parrot/string_funcs.h
==============================================================================
--- trunk/include/parrot/string_funcs.h	Tue Jul 21 22:40:22 2009	(r40202)
+++ trunk/include/parrot/string_funcs.h	Tue Jul 21 23:08:57 2009	(r40203)
@@ -540,10 +540,6 @@
 char * string_to_cstring_nullable(SHIM_INTERP,
     ARGIN_NULLOK(const STRING *s));
 
-void Parrot_str_free(PARROT_INTERP, ARGIN(STRING *s))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
-
 PARROT_WARN_UNUSED_RESULT
 PARROT_CANNOT_RETURN_NULL
 STRING * Parrot_str_from_int_base(PARROT_INTERP,
@@ -734,9 +730,6 @@
     || PARROT_ASSERT_ARG(b) \
     || PARROT_ASSERT_ARG(e)
 #define ASSERT_ARGS_string_to_cstring_nullable __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
-#define ASSERT_ARGS_Parrot_str_free __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp) \
-    || PARROT_ASSERT_ARG(s)
 #define ASSERT_ARGS_Parrot_str_from_int_base __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(tc)

Modified: trunk/src/string/api.c
==============================================================================
--- trunk/src/string/api.c	Tue Jul 21 22:40:22 2009	(r40202)
+++ trunk/src/string/api.c	Tue Jul 21 23:08:57 2009	(r40203)
@@ -229,27 +229,6 @@
 
 /*
 
-=item C<void Parrot_str_free(PARROT_INTERP, STRING *s)>
-
-Frees the given STRING's header, accounting for reference counts for the
-STRING's buffer &c.  Use this only if you I<know> that nothing else has stored
-the STRING elsewhere.
-
-This function has been deprecated.
-
-=cut
-
-*/
-
-void
-Parrot_str_free(PARROT_INTERP, ARGIN(STRING *s))
-{
-    ASSERT_ARGS(Parrot_str_free)
-    Parrot_gc_free_string_header(interp, s);
-}
-
-/*
-
 =back
 
 =head2 Basic String Functions