lab01.cbp

@@ -13,10 +13,11 @@
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
+					<Add option="-DCURL_STATICLIB" />
 					<Add directory="curl/include" />
 				</Compiler>
 				<Linker>
-					<Add library="libcurl.dll.a" />
+					<Add library="libcurl.a" />
 					<Add directory="curl/lib" />
 				</Linker>
 			</Target>
@@ -36,12 +37,7 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
-			<Add directory="curl/include" />
 		</Compiler>
-		<Linker>
-			<Add library="libcurl.dll.a" />
-			<Add directory="curl/lib" />
-		</Linker>
 		<Unit filename=".gitignore" />
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram.h" />

main.cpp

@@ -4,9 +4,6 @@
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-#include <sstream>
-#include <string>
-
 
 
 using namespace std;
@@ -19,13 +16,13 @@ using namespace std;
 };
 
 Input
-input_data(istream& in, bool prompt){  //& òê íåëüçÿ ñêîïèðîâàòü ïîòîê ââîäà   istream óïðàâëÿåò èçâëå÷åíèåì îáúåêòîâ
+input_data(istream& in){  //& òê íåëüçÿ ñêîïèðîâàòü ïîòîê ââîäà   istream óïðàâëÿåò èçâëå÷åíèåì îáúåêòîâ
 
     setlocale(LC_ALL, "RUSSIAN");
 
     Input in2;
 
-    //bool prompt = true;
+    bool prompt = true;
     if (prompt) cerr << "Ââåäèòå êîëè÷åñòâî ÷èñåë: ";
     in >> in2.number_count;
 
@@ -46,71 +43,18 @@ input_data(istream& in, bool prompt){  //&
     return in2;
 };
 
-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(reinterpret_cast<const char*>(items), data_size);
-
-    return data_size;
-}
-
-
-Input
-download(const string& address) {
-    stringstream buffer;
-
-    CURL* curl = curl_easy_init();
-
-    if(curl) {
-        CURLcode res;
-        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-
-        res = curl_easy_perform(curl);
-
-        if(!res){
-            curl_off_t speed;
-            res = curl_easy_getinfo(curl, CURLINFO_SPEED_DOWNLOAD_T, &speed);
-            if(!res){
-                cerr << "Download speed " << speed << endl;
-            }
-        }
-
-        if(res != CURLE_OK){
-            fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
-            exit(1);
-        }
-        curl_easy_cleanup(curl);
-    }
-
-    return input_data(buffer, false);
-}
-
 
 int
-main(int argc, char* argv[]) {
+main(){
 
-    Input input;
+    curl_global_init(CURL_GLOBAL_ALL);
 
-    if (argc > 1) {
+    auto in = input_data(cin);
-        input = download(argv[1]);
+    auto bins = make_histogram(in.numbers, in.bin_count);
-    } else {
+    show_histogram_text(bins, in.number_count, in.bin_count);
-        input = input_data(cin, true);
-    }
 
-    const auto bins = make_histogram(input.numbers, input.bin_count);
-    show_histogram_text(bins, input.number_count, input.bin_count);
     return 0;
 }
 
 
-    //curl_global_init(CURL_GLOBAL_ALL);
-    //auto in = input_data(cin);
-    //auto bins = make_histogram(in.numbers, in.bin_count);
-    //show_histogram_text(bins, in.number_count, in.bin_count);
-
 // cin - ïåðåìåííàÿ êîòîðàÿ ïðåäñòàâëÿåò ïîòîê