Merge pull request #116 from dqnk/main

Cleaning up old code for printing GPUS
This commit is contained in:
TheDarkBug 2021-07-23 13:58:25 +02:00 committed by GitHub
commit a37fb5edbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -93,7 +93,7 @@ int ascii_image_flag = 0, // when (0) ascii is printed, when (1) image is printe
show_colors = 1; show_colors = 1;
char user[32], host[256], shell[64], host_model[256], kernel[256], version_name[64], cpu_model[256], char user[32], host[256], shell[64], host_model[256], kernel[256], version_name[64], cpu_model[256],
gpu_model[8][256] = {{'0'}, {'0'}, {'0'}, {'0'}, {'0'}, {'0'}, {'0'}, {'0'}}, gpu_model[64][256],
pkgman_name[64], image_name[128], *config_directory = NULL; pkgman_name[64], image_name[128], *config_directory = NULL;
// functions definitions, to use them in main() // functions definitions, to use them in main()
@ -314,7 +314,7 @@ void print_info()
if (show_gpu) if (show_gpu)
{ {
int gpu_iter = 0; int gpu_iter = 0;
while (gpu_model[gpu_iter][0] != '0') while (gpu_model[gpu_iter][0])
{ {
printf("\033[18C%s%sGPUWU %s%s\n", printf("\033[18C%s%sGPUWU %s%s\n",
NORMAL, BOLD, NORMAL, gpu_model[gpu_iter]); NORMAL, BOLD, NORMAL, gpu_model[gpu_iter]);
@ -551,7 +551,7 @@ void get_info()
FILE *gpu; FILE *gpu;
gpu = popen("lshw -class display 2> /dev/null", "r"); gpu = popen("lshw -class display 2> /dev/null", "r");
// add all gpus to the array gpu_model (up to 8 gpus) // add all gpus to the array gpu_model
while (fgets(line, sizeof(line), gpu)) while (fgets(line, sizeof(line), gpu))
if (sscanf(line, " product: %[^\n]", gpu_model[gpun])) if (sscanf(line, " product: %[^\n]", gpu_model[gpun]))
gpun++; gpun++;