1 files changed, 0 insertions, 25 deletions

diff --git a/lib/util.cc b/lib/util.cc
index 1e7335c..d78b5e0 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -38,101 +38,76 @@ namespace opkele {
 	string bignum_to_base64(const BIGNUM *bn) {
 	    vector<unsigned char> bin(BN_num_bytes(bn));
 	    int l = BN_bn2bin(bn,&(bin.front()));
 	    string rv;
 	    mimetic::Base64::Encoder b(0);
 	    mimetic::encode(
 		    bin.begin(),bin.begin()+l, b,
 		    back_insert_iterator<string>(rv) );
 	    return rv;
 	}
 
 	/*
 	 * w3c times
 	 */
 
 	string time_to_w3c(time_t t) {
 	    struct tm tm_t;
 	    if(!gmtime_r(&t,&tm_t))
 		throw failed_conversion(OPKELE_CP_ "failed to BN_dec2bn()");
 	    char rv[25];
 	    if(!strftime(rv,sizeof(rv)-1,"%Y-%m-%dT%H:%M:%SZ",&tm_t))
 		throw failed_conversion(OPKELE_CP_ "failed to strftime()");
 	    return rv;
 	}
 
 	time_t w3c_to_time(const string& w) {
 	    struct tm tm_t;
 	    memset(&tm_t,0,sizeof(tm_t));
 	    if(
 		    sscanf(
 			w.c_str(),
 			"%04d-%02d-%02dT%02d:%02d:%02dZ",
 			&tm_t.tm_year,&tm_t.tm_mon,&tm_t.tm_mday,
 			&tm_t.tm_hour,&tm_t.tm_min,&tm_t.tm_sec
 		    ) != 6 )
 		throw failed_conversion(OPKELE_CP_ "failed to sscanf()");
 	    tm_t.tm_mon--;
 	    tm_t.tm_year-=1900;
 	    time_t rv = mktime(&tm_t);
 	    if(rv==(time_t)-1)
 		throw failed_conversion(OPKELE_CP_ "failed to mktime()");
 	    return rv;
 	}
 
 	/*
 	 *
 	 */
 
-	string canonicalize_url(const string& url) {
-	    string rv = url;
-	    // strip leading and trailing spaces
-	    string::size_type i = rv.find_first_not_of(" \t\r\n");
-	    if(i==string::npos)
-		throw bad_input(OPKELE_CP_ "empty URL");
-	    if(i)
-		rv.erase(0,i);
-	    i = rv.find_last_not_of(" \t\r\n");
-	    assert(i!=string::npos);
-	    if(i<(rv.length()-1))
-		rv.erase(i+1);
-	    // add missing http://
-	    i = rv.find("://");
-	    if(i==string::npos) { // primitive. but do we need more?
-		rv.insert(0,"http://");
-		i = sizeof("http://")-1;
-	    }else{
-		i += sizeof("://")-1;
-	    }
-	    if(rv.find('/',i)==string::npos)
-		rv += '/';
-	    return rv;
-	}
-
 	string url_encode(const string& str) {
 	    char * t = curl_escape(str.c_str(),str.length());
 	    if(!t)
 		throw failed_conversion(OPKELE_CP_ "failed to curl_escape()");
 	    string rv(t);
 	    curl_free(t);
 	    return rv;
 	}
 
 	string long_to_string(long l) {
 	    char rv[32];
 	    int r=snprintf(rv,sizeof(rv),"%ld",l);
 	    if(r<0 || r>=sizeof(rv))
 		throw failed_conversion(OPKELE_CP_ "failed to snprintf()");
 	    return rv;
 	}
 
 	long string_to_long(const string& s) {
 	    char *endptr = 0;
 	    long rv = strtol(s.c_str(),&endptr,10);
 	    if((!endptr) || endptr==s.c_str())
 		throw failed_conversion(OPKELE_CP_ "failed to strtol()");
 	    return rv;
 	}
 
     }
 
 }