.gitignore

@@ -1,5 +1,4 @@
 /bin
 /obj
-/curl
 /*.layout
 /*.depend

lab01.cbp

@@ -14,12 +14,7 @@
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
-					<Add directory="C:/Users/jonny-junior/Desktop/lab01/curl/include" />
 				</Compiler>
-				<Linker>
-					<Add library="C:/Users/jonny-junior/Desktop/lab01/curl/lib/libcurl.dll.a" />
-					<Add directory="C:/Users/jonny-junior/Desktop/lab01/curl/lib" />
-				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="bin/Release/lab01" prefix_auto="1" extension_auto="1" />

main.cpp

@@ -1,6 +1,3 @@
-#include <sstream>
-#include <string>
-#include <curl/curl.h>
 #include <iostream>
 #include <vector>
 #include "histogram.h"
@@ -19,66 +16,25 @@ using namespace std;
 //  Ââîä îöåíêîê ñ êëàâèàòóðû.
 
 Input
-input_data(istream& in, bool prompt)
+input_data()
 {
-    Input local;
+    Input in;
     size_t number_count;
 
     cerr << "Enter number count: ";
-    in >> number_count;
+    cin >> number_count;
-    local.numbers.resize(number_count);
+    in.numbers.resize(number_count);
     for (size_t i = 0; i < number_count; i++)
-        in >> local.numbers[i];
+        cin >> in.numbers[i];
-    if (prompt)
     cerr << "Enter bin count: ";
-    in >> local.bin_count;
+    cin >> in.bin_count;
-    return local;
+    return in;
 }
 
-// Çàãðóçêà ôàéëà èç ñåòè â áóôåð.
+int main()
-
-Input
-download(const string& address)
-{
-    stringstream buffer;
-
-    CURL *curl = curl_easy_init();
-    if(curl)
-        {
-            CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, address);
-            res = curl_easy_perform(curl);
-            if (res != CURLE_OK)
-                {
-                    cerr << curl_easy_strerror(res);
-                    exit(1);
-                }
-            curl_easy_cleanup(curl);
-        }
-    return input_data(buffer, false);
-}
-
-// Ñîõðàíåíèå ôàéëà èç ñåòè â áóôåð.
-
-size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx)
 {
-    size_t data_size = item_size * item_count;
+    auto in = input_data();
-
+    auto bins = make_histogram(in.numbers, in.bin_count);
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    buffer->write(reinterpret_cast<const char*>(items), data_size);
-    return data_size;
-}
-
-
-int main(int argc, char* argv[])
-{
-    Input input;
-    if (argc > 1)
-        input = download(argv[1]);
-    else
-        input = input_data(cin, true);
-
-    const auto bins = make_histogram(input.numbers, input.bin_count);
     show_histogram_svg(bins);
+    return 0;
 }
-