mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-03 16:40:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove debug printfs from std/uri

Browse source
This commit is contained in:
Andreas Zwinkau 2013-06-21 12:29:25 +02:00
parent fde07f22f2
commit 29cfa67a2b
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
std/uri.d
View file

@ -26,14 +26,14 @@
*/ */
module std.uri; module std.uri;
//debug=uri; // uncomment to turn on debugging printf's //debug=uri; // uncomment to turn on debugging writefln's
debug(uri) private import std.stdio;
/* ====================== URI Functions ================ */ /* ====================== URI Functions ================ */
private import std.ascii; private import std.ascii;
private import std.c.stdlib; private import std.c.stdlib;
private import std.utf; private import std.utf;
private import std.stdio;
import std.exception; import std.exception;
class URIerror : Error class URIerror : Error
@ -226,8 +226,6 @@ private dstring URI_Decode(string string, uint reservedSet)
uint V; uint V;
dchar C; dchar C;
//printf("URI_Decode('%.*s')\n", string);
// Result array, allocated on stack // Result array, allocated on stack
dchar* R; dchar* R;
uint Rlen; uint Rlen;
@ -393,7 +391,6 @@ size_t uriLength(string s)
if (s.length <= 4) if (s.length <= 4)
goto Lno; goto Lno;
//writefln("isURL(%s)", s);
if (s.length > 7 && std.string.icmp(s[0 .. 7], "http://") == 0) if (s.length > 7 && std.string.icmp(s[0 .. 7], "http://") == 0)
i = 7; i = 7;
else if (s.length > 8 && std.string.icmp(s[0 .. 8], "https://") == 0) else if (s.length > 8 && std.string.icmp(s[0 .. 8], "https://") == 0)
@ -468,7 +465,6 @@ size_t emailLength(string s)
i++; i++;
break; break;
} }
//writefln("test1 '%s'", s[0 .. i]);
/* Now do the part past the '@' /* Now do the part past the '@'
*/ */
@ -507,23 +503,22 @@ unittest
unittest unittest
{ {
debug(uri) printf("uri.encodeURI.unittest\n"); debug(uri) writeln("uri.encodeURI.unittest");
string s = "http://www.digitalmars.com/~fred/fred's RX.html#foo"; string s = "http://www.digitalmars.com/~fred/fred's RX.html#foo";
string t = "http://www.digitalmars.com/~fred/fred's%20RX.html#foo"; string t = "http://www.digitalmars.com/~fred/fred's%20RX.html#foo";
auto r = encode(s); auto r = encode(s);
debug(uri) printf("r = '%.*s'\n", r); debug(uri) writefln("r = '%s'", r);
assert(r == t); assert(r == t);
r = decode(t); r = decode(t);
debug(uri) printf("r = '%.*s'\n", r); debug(uri) writefln("r = '%s'", r);
assert(r == s); assert(r == s);
r = encode( decode("%E3%81%82%E3%81%82") ); r = encode( decode("%E3%81%82%E3%81%82") );
assert(r == "%E3%81%82%E3%81%82"); assert(r == "%E3%81%82%E3%81%82");
r = encodeComponent("c++"); r = encodeComponent("c++");
//printf("r = '%.*s'\n", r);
assert(r == "c%2B%2B"); assert(r == "c%2B%2B");
auto str = new char[10_000_000]; auto str = new char[10_000_000];
@ -533,5 +528,5 @@ unittest
assert(c == 'A'); assert(c == 'A');
r = decode("%41%42%43"); r = decode("%41%42%43");
debug(uri) writefln(r); debug(uri) writeln(r);
} }