From abe3588e56850403f7ebaf3c9090552e5f4830c6 Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Mon, 19 Sep 2022 16:19:01 +0200
Subject: Exports: Simplify building

- Remove subdir c
- Do not compile c code as a separate shared library
- Move all definitions/declarations into the preamble as they shouldn't be shared anyways. So no headers are needed
- Define the callback as static, needed so we don't get a duplicate declaration
---
 exports/c/common.c  |  6 ------
 exports/c/common.h  |  3 ---
 exports/c/disco.h   | 34 ----------------------------------
 exports/c/servers.h | 44 --------------------------------------------
 4 files changed, 87 deletions(-)
 delete mode 100644 exports/c/common.c
 delete mode 100644 exports/c/common.h
 delete mode 100644 exports/c/disco.h
 delete mode 100644 exports/c/servers.h

(limited to 'exports/c')

diff --git a/exports/c/common.c b/exports/c/common.c
deleted file mode 100644
index 425a459..0000000
--- a/exports/c/common.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "common.h"
-
-void call_callback(PythonCB callback, const char *name, int oldstate, int newstate, void* data)
-{
-    callback(name, oldstate, newstate, data);
-}
diff --git a/exports/c/common.h b/exports/c/common.h
deleted file mode 100644
index 068ad4c..0000000
--- a/exports/c/common.h
+++ /dev/null
@@ -1,3 +0,0 @@
-typedef void (*PythonCB)(const char* name, int oldstate, int newstate, void* data);
-
-void call_callback(PythonCB callback, const char *name, int oldstate, int newstate, void* data);
diff --git a/exports/c/disco.h b/exports/c/disco.h
deleted file mode 100644
index 8fa07a4..0000000
--- a/exports/c/disco.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// for size_t
-#include <stddef.h>
-
-typedef struct discoveryServer {
-  const char* authentication_url_template;
-  const char* base_url;
-  const char* country_code;
-  const char* display_name;
-  const char* keyword_list;
-  const char** public_key_list;
-  size_t total_public_keys;
-  const char* server_type;
-  const char** support_contact;
-  size_t total_support_contact;
-} discoveryServer;
-
-typedef struct discoveryServers {
-  unsigned long long int version;
-  discoveryServer** servers;
-  size_t total_servers;
-} discoveryServers;
-
-typedef struct discoveryOrganization {
-  const char* display_name;
-  const char* org_id;
-  const char* secure_internet_home;
-  const char* keyword_list;
-} discoveryOrganization;
-
-typedef struct discoveryOrganizations {
-  unsigned long long int version;
-  discoveryOrganization** organizations;
-  size_t total_organizations;
-} discoveryOrganizations;
diff --git a/exports/c/servers.h b/exports/c/servers.h
deleted file mode 100644
index 1b6cca9..0000000
--- a/exports/c/servers.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// for size_t
-#include <stddef.h>
-
-// The struct for a single server profile
-typedef struct serverProfile {
-  const char* id;
-  const char* display_name;
-  //const char* proto_list;
-  int default_gateway;
-} serverProfile;
-
-// The struct for all server profiles
-typedef struct serverProfiles {
-  int current;
-  serverProfile** profiles;
-  size_t total_profiles;
-} serverProfiles;
-
-// The struct for server locations
-typedef struct serverLocations {
-  const char** locations;
-  size_t total_locations;
-} serverLocations;
-
-// The struct for a single server
-typedef struct server {
-  const char* identifier;
-  const char* display_name;
-  const char* server_type;
-  const char* country_code;
-  const char** support_contact;
-  size_t total_support_contact;
-  serverProfiles* profiles;
-  unsigned long long int expire_time;
-} server;
-
-// The struct for all servers
-typedef struct servers {
-  server** custom_servers;
-  size_t total_custom;
-  server** institute_servers;
-  size_t total_institute;
-  server* secure_internet_server;
-} servers;
-- 
cgit v1.2.3