nasr/synf-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflicts that remained from a previous merge

Browse Source
This commit is contained in:
Abdellah El Morabit 2025-10-11 10:35:08 +02:00
parent 47a65de313
commit 6927df5ec2
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/main.c
View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
<<<<<<< HEAD
#include <pthread.h>
#include "headers/cpu.h"
#include "headers/ram.h"
@ -28,32 +26,6 @@ void handler(char *url, cJSON object) {
curl_easy_cleanup(curl);
}
curl_global_cleanup();
=======
#include <stdio.h>
#include "cpu.h"
int main(int argc, char* argv[]) {
if (argc > 0)
{
switch (*argv[1]){
case "name":
char *name = cpu_name(void);
printf("%s", &name);
break;
case "frequency":
float frequency = cpu_freq(void);
printf("%f", frequency);
break;
default:
return 1;
}
return 1;
}
return 0;
>>>>>>> 7e64275 (maocs now returns cpu name)
}
void setup_mt() {