main.cpp

@@ -8,8 +8,6 @@
 #include <conio.h>
 #include "histogam_internal.h"
 #include <curl/curl.h>
-#include <sstream>
-#include <string>
 using namespace std;
 
 
@@ -63,58 +61,26 @@ input_data(istream& in, bool promt)
     ik.numbers.resize(number_count);
     for (size_t i = 0; i < number_count; i++)
     {
-        in >> ik.numbers[i];
+        cin >> ik.numbers[i];
     }
     cerr << "Enter bin count: ";
-    in>> ik.bin_count;
+    cin>> ik.bin_count;
     return ik;
 }
 
-size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx)
-{
-    size_t data_size = item_size * item_count;
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    buffer->write(static_cast<const char*>(items), data_size);
-    return 0;
-}
 
 
-Input
-download(const string& address)
-{
-stringstream buffer;
-    CURL *curl = curl_easy_init();
-    if(curl)
-    {
-        CURLcode res;
-        curl_easy_setopt(curl, CURLOPT_URL, address);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-        res = curl_easy_perform(curl);
-        curl_easy_cleanup(curl);
-        if (res != CURLE_OK)
-        {
-            cout << curl_easy_strerror;
-            exit(1);
-        }
-    }
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-
-    return input_data(buffer, false);
-}
-
 
 int main(int argc, char* argv[])
 {
-    Input input;
-    if (argc > 1)
-    {
-        input = download(argv[1]);
-    }
-    else
-    {
-        input = input_data(cin, true);
+    if (argc > 1){
+        cout << argc << "argv[0] = " << argv << endl;
+        return 0;
     }
-
-    const auto bins = make_histogram(input.numbers, input.bin_count);
+    curl_global_init(CURL_GLOBAL_ALL);
+    auto in = input_data(cin, true);
+    auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
+    getch();
+    return 0;
 }