diff --git a/lab01.cbp b/lab01.cbp index dbd06a2..a6864f6 100644 --- a/lab01.cbp +++ b/lab01.cbp @@ -31,7 +31,12 @@ + + + + + diff --git a/main.cpp b/main.cpp index 0f543b2..7e9e957 100644 --- a/main.cpp +++ b/main.cpp @@ -15,13 +15,6 @@ struct Input size_t bin_count{}; }; -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(ctx); - buffer->write(reinterpret_cast(items), data_size); - return data_size; -} - Input input_data(istream& in, bool prompt) { @@ -50,6 +43,13 @@ input_data(istream& in, bool prompt) return cin; } +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(ctx); + buffer->write(reinterpret_cast(items), data_size); + return data_size; +} + Input download(const string& address) { stringstream buffer; @@ -82,15 +82,15 @@ download(const string& address) { int main(int argc, char* argv[]) { + CURL* curl = curl_easy_init(); Input input; if (argc > 1) { input = download(argv[1]); } else { + input = input_data(cin, true); } - size_t max_count; - auto in = input_data(cin, true); - auto bins = make_histogram(in.numbers, in.bin_count); + auto bins = make_histogram(input.numbers, input.bin_count); show_histogram_svg(bins); }