main.cpp

@@ -7,8 +7,6 @@
 #include "text.h"
 #include "svg.h"
 #include <curl/curl.h>
-#include <sstream>
-#include <string>
 using namespace std;
 
 struct Input
@@ -33,62 +31,33 @@ input_data(istream& in, bool prompt)
     cerr << "Input numbers: ";
     for (size_t i = 0; i < number_count; i++)
         {
-        in >> ik.numbers[i];
+        cin >> ik.numbers[i];
         }
     cerr << "Input 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]);
+        CURL *curl = curl_easy_init();
-    }
+        if(curl)
-    else
+        {
-    {
+            CURLcode res;
-        input = input_data(cin, true);
+            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+            res = curl_easy_perform(curl);
+            curl_easy_cleanup(curl);
+        }
+        return 0;
     }
+    curl_global_init(CURL_GLOBAL_ALL);
 
-    const auto bins = make_histogramm(input.numbers, input.bin_count);
+	auto in = input_data(cin, true);
+
+	auto bins = make_histogramm(in.numbers, in.bin_count);
 
 	show_histogram_svg(bins);