main.cpp

@@ -7,8 +7,6 @@
 #include "svg.h"
 #include "histogram_internal.h"
 #include <curl/curl.h>
-#include <sstream>
-#include <string>
 using namespace std;
 
 struct Input {
@@ -38,44 +36,10 @@ input_data(istream &tin, bool prompt){
 //
 
 
-size_t
+int main() {
-write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+    curl_global_init(CURL_GLOBAL_ALL);
-    size_t data_size = item_size * item_count;
+    Input in = input_data(cin, false);
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    auto bins = make_histogramm(in.numbers, in.bin_count);
-    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 != 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[]) {
-    Input input;
-    if (argc > 1) {
-        input = download(argv[1]);
-    } else {
-        input = input_data(cin, true);
-    }
-    const auto bins = make_histogramm(input.numbers, input.bin_count);
     show_histogram_svg(bins);
+    return 0;
 }