diff --git a/main.cpp b/main.cpp index a745614..9cf153d 100644 --- a/main.cpp +++ b/main.cpp @@ -42,7 +42,6 @@ write_data(void* items, size_t item_size, size_t item_count, void* ctx){ size_t data_size = item_count * item_size; stringstream* buffer = reinterpret_cast(ctx); char* item = reinterpret_cast(items); - //buffer.write(items, data_size); buffer->write(item, data_size); return data_size; } @@ -57,8 +56,8 @@ download(const string& address){ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer); res = curl_easy_perform(curl); - curl_easy_cleanup(curl); if (res != 0){ + cerr << curl_version_info(CURLVERSION_NOW) << endl; cerr << curl_easy_strerror(res) << endl; exit(1); } @@ -74,29 +73,15 @@ main(int argc, char* argv[]) { curl_global_init(CURL_GLOBAL_ALL); Input input; - /* - if (argc > 1){ - CURL* curl = curl_easy_init(); - if(curl) { - CURLcode res; - curl_easy_setopt(curl, CURLOPT_URL, argv[1]); - res = curl_easy_perform(curl); - curl_easy_cleanup(curl); - if (res != 0){ - cerr << curl_easy_strerror(res) << endl; - exit(1); - } - } - curl_easy_cleanup(curl); - }*/ if (argc > 1){ input = download(argv[1]); } else{ input = input_data(cin, true); } - //auto in = input_data(cin, true); const auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); + cerr << "cURL version " << curl_version_info(CURLVERSION_NOW) << endl; + //cerr << SSLeay_version(SSLEAY_VERSION) << endl; return 0; }