diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d80e64..70399bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,4 +11,3 @@ ADD_EXECUTABLE(main source/lib.c ) -TARGET_INCLUDE_DIRECTORIES(main PRIVATE source/lib/osx source/lib/linux) diff --git a/source/lib.c b/source/lib.c index 8d741a9..8a443ad 100644 --- a/source/lib.c +++ b/source/lib.c @@ -6,7 +6,6 @@ * */ - #include #include #include diff --git a/source/lib.h b/source/lib.h index add7a87..3e92fe3 100644 --- a/source/lib.h +++ b/source/lib.h @@ -1,8 +1,6 @@ -#ifndef LIB_L -#ifndef LIB_O +#ifndef LIB_H +#define LIB_H -#define LIB_L -#define LIB_O #include "types.h" @@ -27,5 +25,3 @@ void device_model(); #endif -#endif - diff --git a/source/main.c b/source/main.c index 44b946c..4f69662 100644 --- a/source/main.c +++ b/source/main.c @@ -1,56 +1,12 @@ #include -#include -#include #include #include -#include "lib.h" +#include "types.h" - -void *gather_cpu_information(); -void *gather_ram_information(); -void *gather_disk_information(); -void *gather_device_information(); -void get_c_version(); - -/* - cJSON convert_to_json() { - - cJSON *root = cJSON_CreateObject(); - cJSON_AddStringToObject(root, "cpu", info.cpu->name); - cJSON_AddNumberToObject(root, "ram", info.ram->total); - cJSON_AddStringToObject(root, "disk", info.disk->name); - cJSON_AddStringToObject(root, "device", info.device->name); - - return *root; - } - - void handler(char *url) { - CURL *curl; - CURLcode res; - - curl_global_init(CURL_GLOBAL_ALL); - curl = curl_easy_init(); - - if (curl) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "POST"); - curl_easy_setopt(curl, CURLOPT_URL, url); - -// TO DO -// parse the object to a json and pass that as an argument to post it -curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL); - -res = curl_easy_perform(curl); -if (res != CURLE_OK) -fprintf(stderr, "curl_easy_perform() failed: %s\n", -curl_easy_strerror(res)); - -curl_easy_cleanup(curl); -} -curl_global_cleanup(); -} - - -*/ +void get_cpu(); +void get_ram(); +void get_disk(); +void get_device(); void get_c_version() { @@ -68,6 +24,8 @@ void get_c_version() int main(int argc, char** argv) { + printf("%d", u_cpu->temperature); + return 0; }