[svn:parrot] r48981 - in trunk/src: . interp io pmc string

[nwellnhof at svn.parrot.org]

Author: nwellnhof
Date: Mon Sep 13 19:17:36 2010
New Revision: 48981
URL: https://trac.parrot.org/parrot/changeset/48981

Log:
Update a handful of comments still mentioning charsets

Modified:
   trunk/src/dynext.c
   trunk/src/hash.c
   trunk/src/interp/inter_create.c
   trunk/src/io/socket_unix.c
   trunk/src/io/socket_win32.c
   trunk/src/pmc/bytebuffer.pmc
   trunk/src/string/encoding.c

Modified: trunk/src/dynext.c
==============================================================================
--- trunk/src/dynext.c	Mon Sep 13 18:55:52 2010	(r48980)
+++ trunk/src/dynext.c	Mon Sep 13 19:17:36 2010	(r48981)
@@ -529,8 +529,7 @@
 =item C<static STRING * clone_string_into(Interp *d, Interp *s, PMC *value)>
 
 Extracts a STRING value from PMC C<value> in interpreter C<s>. Copies that
-string into the pool of interpreter C<d> using the default encoding
-and charset.
+string into the pool of interpreter C<d> using the default encoding.
 
 =cut
 

Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c	Mon Sep 13 18:55:52 2010	(r48980)
+++ trunk/src/hash.c	Mon Sep 13 19:17:36 2010	(r48981)
@@ -285,7 +285,7 @@
 *search_key, const void *bucket_key)>
 
 Compare two strings. Returns 0 if they are identical. Considers differing
-charset or encoding to be distinct.
+encodings to be distinct.
 
 */
 

Modified: trunk/src/interp/inter_create.c
==============================================================================
--- trunk/src/interp/inter_create.c	Mon Sep 13 18:55:52 2010	(r48980)
+++ trunk/src/interp/inter_create.c	Mon Sep 13 19:17:36 2010	(r48981)
@@ -446,7 +446,7 @@
         interp->evc_func_table_size = 0;
     }
 
-    /* strings, charsets, encodings - only once */
+    /* strings, encodings - only once */
     Parrot_str_finish(interp);
 
     PARROT_CORE_OPLIB_INIT(interp, 0);

Modified: trunk/src/io/socket_unix.c
==============================================================================
--- trunk/src/io/socket_unix.c	Mon Sep 13 18:55:52 2010	(r48980)
+++ trunk/src/io/socket_unix.c	Mon Sep 13 19:17:36 2010	(r48981)
@@ -349,7 +349,7 @@
 AGAIN:
     if ((error = recv(io->os_handle, buf, 2048, 0)) >= 0) {
         bytesread += error;
-        /* The charset should probably be 'binary', but right now httpd.pir
+        /* The encoding should probably be 'binary', but right now httpd.pir
          * only works with 'ascii'
          */
         *s = Parrot_str_new_init(interp, buf, bytesread,

Modified: trunk/src/io/socket_win32.c
==============================================================================
--- trunk/src/io/socket_win32.c	Mon Sep 13 18:55:52 2010	(r48980)
+++ trunk/src/io/socket_win32.c	Mon Sep 13 19:17:36 2010	(r48981)
@@ -299,7 +299,7 @@
 AGAIN:
     if ((error = recv((int)io->os_handle, buf, 2048, 0)) >= 0) {
         bytesread += error;
-        /* The charset should probably be 'binary', but right now httpd.pir
+        /* The encoding should probably be 'binary', but right now httpd.pir
          * only works with 'ascii'
          */
         *s = Parrot_str_new_init(interp, buf, bytesread,

Modified: trunk/src/pmc/bytebuffer.pmc
==============================================================================
--- trunk/src/pmc/bytebuffer.pmc	Mon Sep 13 18:55:52 2010	(r48980)
+++ trunk/src/pmc/bytebuffer.pmc	Mon Sep 13 19:17:36 2010	(r48981)
@@ -303,10 +303,9 @@
 
 =over 4
 
-=item C<get_string(string charset, string encoding)>
+=item C<get_string(string encoding)>
 
-Create a string with the buffer content and the charset and encoding
-specified.
+Create a string with the buffer content and the encoding specified.
 
 =cut
 
@@ -328,7 +327,7 @@
 
 =item C<get_string_as(string as)>
 
-Create a string with the buffer content and the same charset and encoding
+Create a string with the buffer content and the same encoding
 as the string argument.
 
 =cut
@@ -365,7 +364,7 @@
 =item C<static STRING * build_string(PARROT_INTERP, const unsigned char
 *content, INTVAL size, const STR_VTABLE *encoding)>
 
-Build a string fro the buffer content with the charset and encoding specified.
+Build a string from the buffer content with the encoding specified.
 
 =cut
 

Modified: trunk/src/string/encoding.c
==============================================================================
--- trunk/src/string/encoding.c	Mon Sep 13 18:55:52 2010	(r48980)
+++ trunk/src/string/encoding.c	Mon Sep 13 19:17:36 2010	(r48981)
@@ -290,7 +290,7 @@
 =item C<void Parrot_str_internal_register_encoding_names(PARROT_INTERP)>
 
 Helper function for initializing characterset encoding names. We can't create
-the STRING names until the default encodings and charsets are already initted,
+the STRING names until the default encodings are already initted,
 so the name generation is split into a second init stage.
 
 =cut
@@ -351,8 +351,7 @@
 
 =item C<void Parrot_encodings_init(PARROT_INTERP)>
 
-Creates the initial charsets and encodings, and registers the initial
-charset converters.
+Creates the initial encodings.
 
 =cut