[svn:parrot] r49002 - trunk/runtime/parrot/library/URI

[nwellnhof at svn.parrot.org]

Author: nwellnhof
Date: Tue Sep 14 19:11:14 2010
New Revision: 49002
URL: https://trac.parrot.org/parrot/changeset/49002

Log:
Use find_encoding instead of find_charset in URI::Escape

Modified:
   trunk/runtime/parrot/library/URI/Escape.pir

Modified: trunk/runtime/parrot/library/URI/Escape.pir
==============================================================================
--- trunk/runtime/parrot/library/URI/Escape.pir	Tue Sep 14 18:00:28 2010	(r49001)
+++ trunk/runtime/parrot/library/URI/Escape.pir	Tue Sep 14 19:11:14 2010	(r49002)
@@ -40,13 +40,12 @@
     .param string s
     .param string except
 
-    .local int asciicharset, utf8enc, scharset, senc
-    asciicharset = find_charset 'ascii'
-    scharset = charset s
-    if scharset == asciicharset goto encodeit
+    .local int asciienc, utf8enc, senc
+    senc = encoding s
+    asciienc = find_encoding 'ascii'
+    if senc == asciienc goto encodeit
 
     utf8enc = find_encoding 'utf8'
-    senc = encoding s
     if utf8enc == senc goto encodeit
     s = trans_encoding s, utf8enc