main.cpp

@@ -1,4 +1,3 @@
-#include <sstream>
 #include <vector>
 #include <iostream>
 #include <string>
@@ -54,53 +53,28 @@ input_data(istream& in, bool prompt) {
     return in1;
 }
 
-static size_t
+int main(int argc, char* argv[])
-write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+{
-    size_t data_size = item_size * item_count;
+    curl_global_init(CURL_GLOBAL_ALL);
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    if (argc > 1) {
-    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_off_t connect;
+            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
-        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) {
+            if (res != 0) {
-            fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+                cerr << curl_easy_strerror(res);
                 exit(1);
             }
-        if (CURLE_OK == res) {
-            res = curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME_T, &connect);
-            if (CURLE_OK == res) {
-                fprintf(stderr, "connection time: %" CURL_FORMAT_CURL_OFF_T ".%06ld", connect / 1000000, (long)(connect % 1000000));
-            }
         }
         curl_easy_cleanup(curl);
-    }
+        return(0);
-    return input_data(buffer, false);
-}
         
-int
-main(int argc, char* argv[])
-{
-#include <curl/curl.h>
-    curl_global_init(CURL_GLOBAL_ALL);
-    Input input;
-    if (argc > 1) {
-        input = download(argv[1]);
     }
-    else {
+    const size_t SCREEN_WIDTH = 80;
-        input = input_data(cin, true);
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    }
+    auto in1 = input_data(cin,true);
-
+    auto bins = make_histogram(in1.numbers, in1.bin_count);
-    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins, in1.stroke);
-    show_histogram_svg(bins,input.stroke);
+    return 0;
 }
-