This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enigmatic.
View the commit online.
commit 05bdc745cbc6990bca5450d5c5709445273a8745
Author: Alastair Poole <m...@alastairpoole.com>
AuthorDate: Sun Aug 11 21:00:01 2024 +0100
client: rename API as far too generic.
The naming is longer but less-likely to clash with other symbols.
---
src/bin/client/Enigmatic_Client.h | 26 ++++++++++----------
src/bin/client/enigmatic_client.c | 48 ++++++++++++++++++-------------------
src/bin/examples/blindmin.c | 36 ++++++++++++++--------------
src/bin/examples/cpeew.c | 6 ++---
src/bin/examples/enigmatic_client.c | 48 ++++++++++++++++++-------------------
src/bin/examples/memories.c | 8 +++----
6 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/src/bin/client/Enigmatic_Client.h b/src/bin/client/Enigmatic_Client.h
index 9900a1d..5bf211d 100644
--- a/src/bin/client/Enigmatic_Client.h
+++ b/src/bin/client/Enigmatic_Client.h
@@ -130,45 +130,45 @@ typedef enum
} Enigmatic_Client_Event_Type;
Enigmatic_Client *
-client_open(void);
+enigmatic_client_open(void);
void
-client_monitor_add(Enigmatic_Client *client, Snapshot_Callback *cb_event_change_init, Snapshot_Callback *cb_event_change, void *data);
+enigmatic_client_monitor_add(Enigmatic_Client *client, Snapshot_Callback *cb_event_change_init, Snapshot_Callback *cb_event_change, void *data);
void
-client_event_callback_add(Enigmatic_Client *client, Enigmatic_Client_Event_Type type, Event_Callback *cb_event, void *data);
+enigmatic_client_event_callback_add(Enigmatic_Client *client, Enigmatic_Client_Event_Type type, Event_Callback *cb_event, void *data);
void
-client_read(Enigmatic_Client *client);
+enigmatic_client_read(Enigmatic_Client *client);
Enigmatic_Client *
-client_path_open(char *filename);
+enigmatic_client_path_open(char *filename);
void
-client_del(Enigmatic_Client *client);
+enigmatic_client_del(Enigmatic_Client *client);
Enigmatic_Client *
-client_add(void);
+enigmatic_client_add(void);
void
-client_follow_enabled_set(Enigmatic_Client *client, Eina_Bool enabled);
+enigmatic_client_follow_enabled_set(Enigmatic_Client *client, Eina_Bool enabled);
void
-client_snapshot_callback_set(Enigmatic_Client *client, Snapshot_Callback *cb_event_change, void *data);
+enigmatic_client_snapshot_callback_set(Enigmatic_Client *client, Snapshot_Callback *cb_event_change, void *data);
/* Some events occur multiple times between block end. We can check for a snapshot event to reduce
* the polling granuality when we don't want sub-second data.
*/
Eina_Bool
-client_event_is_snapshot(Enigmatic_Client *client);
+enigmatic_client_event_is_snapshot(Enigmatic_Client *client);
void
-client_replay_time_start_set(Enigmatic_Client *client, uint32_t secs);
+enigmatic_client_replay_time_start_set(Enigmatic_Client *client, uint32_t secs);
void
-client_replay_time_end_set(Enigmatic_Client *client, uint32_t secs);
+enigmatic_client_replay_time_end_set(Enigmatic_Client *client, uint32_t secs);
Eina_Bool
-client_replay(Enigmatic_Client *client);
+enigmatic_client_replay(Enigmatic_Client *client);
#endif
diff --git a/src/bin/client/enigmatic_client.c b/src/bin/client/enigmatic_client.c
index 242c032..bf34ebb 100644
--- a/src/bin/client/enigmatic_client.c
+++ b/src/bin/client/enigmatic_client.c
@@ -59,7 +59,7 @@ buffer_clear(Buffer *buf)
}
static void
-client_reset(Enigmatic_Client *client)
+enigmatic_client_reset(Enigmatic_Client *client)
{
buffer_clear(&client->zbuf);
buffer_clear(&client->buf);
@@ -109,7 +109,7 @@ callback_fire(Enigmatic_Client *client)
}
Eina_Bool
-client_event_is_snapshot(Enigmatic_Client *client)
+enigmatic_client_event_is_snapshot(Enigmatic_Client *client)
{
return client->header.event == EVENT_BLOCK_END;
}
@@ -1129,13 +1129,13 @@ event_end_of_file(Enigmatic_Client *client EINA_UNUSED)
}
Enigmatic_Client *
-client_open(void)
+enigmatic_client_open(void)
{
- return client_path_open(enigmatic_log_path());
+ return enigmatic_client_path_open(enigmatic_log_path());
}
Enigmatic_Client *
-client_path_open(char *filename)
+enigmatic_client_path_open(char *filename)
{
Enigmatic_Client *client = calloc(1, sizeof(Enigmatic_Client));
EINA_SAFETY_ON_NULL_RETURN_VAL(client, NULL);
@@ -1158,9 +1158,9 @@ client_path_open(char *filename)
}
static Eina_Bool
-client_reopen(Enigmatic_Client *client, char *filename)
+enigmatic_client_reopen(Enigmatic_Client *client, char *filename)
{
- client_reset(client);
+ enigmatic_client_reset(client);
if (client->fd != -1)
close(client->fd);
@@ -1187,7 +1187,7 @@ client_reopen(Enigmatic_Client *client, char *filename)
}
void
-client_del(Enigmatic_Client *client)
+enigmatic_client_del(Enigmatic_Client *client)
{
if (client->follow)
{
@@ -1228,7 +1228,7 @@ get_block_size(const LZ4F_frameInfo_t *info)
// WIP
void
-client_read(Enigmatic_Client *client)
+enigmatic_client_read(Enigmatic_Client *client)
{
struct stat st;
int n;
@@ -1245,7 +1245,7 @@ client_read(Enigmatic_Client *client)
client->fd = open(client->filename, O_RDONLY);
if (client->fd == -1)
ERROR("open() %s\n", strerror(errno));
- client_reset(client);
+ enigmatic_client_reset(client);
}
if (!client->compressed)
@@ -1391,11 +1391,11 @@ cb_file_modified(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
if ((st.st_size) && (st.st_size < client->file_size))
{
client->truncated = 1;
- client_read(client);
+ enigmatic_client_read(client);
}
else if (st.st_size > client->file_size)
{
- client_read(client);
+ enigmatic_client_read(client);
if (client->event_snapshot_init.callback)
{
client->event_snapshot_init.callback(client, &client->snapshot, client->event_snapshot_init.data);
@@ -1432,7 +1432,7 @@ cb_thread_fallback_feedback(void *data, Ecore_Thread *thread EINA_UNUSED, void *
#endif
void
-client_event_callback_add(Enigmatic_Client *client, Enigmatic_Client_Event_Type type, Event_Callback *cb_event, void *data)
+enigmatic_client_event_callback_add(Enigmatic_Client *client, Enigmatic_Client_Event_Type type, Event_Callback *cb_event, void *data)
{
switch (type)
{
@@ -1500,7 +1500,7 @@ client_event_callback_add(Enigmatic_Client *client, Enigmatic_Client_Event_Type
}
void
-client_monitor_add(Enigmatic_Client *client, Snapshot_Callback *cb_event_change_init, Snapshot_Callback *cb_event_change, void *data)
+enigmatic_client_monitor_add(Enigmatic_Client *client, Snapshot_Callback *cb_event_change_init, Snapshot_Callback *cb_event_change, void *data)
{
client->follow = 1;
client->event_snapshot_init.callback = cb_event_change_init;
@@ -1517,14 +1517,14 @@ client_monitor_add(Enigmatic_Client *client, Snapshot_Callback *cb_event_change_
}
void
-client_snapshot_callback_set(Enigmatic_Client *client, Snapshot_Callback *cb_event_change, void *data)
+enigmatic_client_snapshot_callback_set(Enigmatic_Client *client, Snapshot_Callback *cb_event_change, void *data)
{
client->event_snapshot.callback = cb_event_change;
client->event_snapshot.data = ""
}
Enigmatic_Client *
-client_add(void)
+enigmatic_client_add(void)
{
Enigmatic_Client *client = calloc(1, sizeof(Enigmatic_Client));
EINA_SAFETY_ON_NULL_RETURN_VAL(client, NULL);
@@ -1536,7 +1536,7 @@ client_add(void)
}
void
-client_follow_enabled_set(Enigmatic_Client *client, Eina_Bool enabled)
+enigmatic_client_follow_enabled_set(Enigmatic_Client *client, Eina_Bool enabled)
{
client->follow = enabled;
}
@@ -1577,7 +1577,7 @@ path_datestamp(const char *path)
}
static Eina_List *
-client_replay_hours(Enigmatic_Client *client)
+enigmatic_client_replay_hours(Enigmatic_Client *client)
{
int hour_last, hours;
time_t t;
@@ -1635,30 +1635,30 @@ client_replay_hours(Enigmatic_Client *client)
}
Eina_Bool
-client_replay(Enigmatic_Client *client)
+enigmatic_client_replay(Enigmatic_Client *client)
{
char *path;
- Eina_List *files = client_replay_hours(client);
+ Eina_List *files = enigmatic_client_replay_hours(client);
if (!files) return 0;
EINA_LIST_FREE(files, path)
{
- client_reopen(client, path);
- client_read(client);
+ enigmatic_client_reopen(client, path);
+ enigmatic_client_read(client);
}
return 1;
}
void
-client_replay_time_start_set(Enigmatic_Client *client, uint32_t secs)
+enigmatic_client_replay_time_start_set(Enigmatic_Client *client, uint32_t secs)
{
client->replay.enabled = 1;
client->replay.start_time = secs;
}
void
-client_replay_time_end_set(Enigmatic_Client *client, uint32_t secs)
+enigmatic_client_replay_time_end_set(Enigmatic_Client *client, uint32_t secs)
{
client->replay.end_time = secs;
}
diff --git a/src/bin/examples/blindmin.c b/src/bin/examples/blindmin.c
index e74f784..48a0ff3 100644
--- a/src/bin/examples/blindmin.c
+++ b/src/bin/examples/blindmin.c
@@ -166,21 +166,21 @@ cb_recording_delay(Enigmatic_Client *client, Enigmatic_Client_Event *event, void
static void
cb_event_change_init(Enigmatic_Client *client, Snapshot *s, void *data)
{
- client_event_callback_add(client, EVENT_CPU_ADD, cb_cpu_add, NULL);
- client_event_callback_add(client, EVENT_CPU_DEL, cb_cpu_del, NULL);
- client_event_callback_add(client, EVENT_BATTERY_ADD, cb_battery_add, NULL);
- client_event_callback_add(client, EVENT_BATTERY_DEL, cb_battery_del, NULL);
- client_event_callback_add(client, EVENT_POWER_SUPPLY_ADD, cb_power_supply_add, NULL);
- client_event_callback_add(client, EVENT_POWER_SUPPLY_DEL, cb_power_supply_del, NULL);
- client_event_callback_add(client, EVENT_SENSOR_ADD, cb_sensor_add, NULL);
- client_event_callback_add(client, EVENT_SENSOR_DEL, cb_sensor_del, NULL);
- client_event_callback_add(client, EVENT_NETWORK_IFACE_ADD, cb_network_iface_add, NULL);
- client_event_callback_add(client, EVENT_NETWORK_IFACE_DEL, cb_network_iface_del, NULL);
- client_event_callback_add(client, EVENT_FILE_SYSTEM_ADD, cb_file_system_add, NULL);
- client_event_callback_add(client, EVENT_FILE_SYSTEM_DEL, cb_file_system_del, NULL);
- client_event_callback_add(client, EVENT_PROCESS_ADD, cb_process_add, NULL);
- client_event_callback_add(client, EVENT_PROCESS_DEL, cb_process_del, NULL);
- client_event_callback_add(client, EVENT_RECORD_DELAY, cb_recording_delay, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_CPU_ADD, cb_cpu_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_CPU_DEL, cb_cpu_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_BATTERY_ADD, cb_battery_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_BATTERY_DEL, cb_battery_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_POWER_SUPPLY_ADD, cb_power_supply_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_POWER_SUPPLY_DEL, cb_power_supply_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_SENSOR_ADD, cb_sensor_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_SENSOR_DEL, cb_sensor_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_NETWORK_IFACE_ADD, cb_network_iface_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_NETWORK_IFACE_DEL, cb_network_iface_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_FILE_SYSTEM_ADD, cb_file_system_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_FILE_SYSTEM_DEL, cb_file_system_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_PROCESS_ADD, cb_process_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_PROCESS_DEL, cb_process_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_RECORD_DELAY, cb_recording_delay, NULL);
}
static void
@@ -188,16 +188,16 @@ monitor(void)
{
if (!enigmatic_launch()) return;
- Enigmatic_Client *client = client_open();
+ Enigmatic_Client *client = enigmatic_client_open();
EINA_SAFETY_ON_NULL_RETURN(client);
- client_monitor_add(client, cb_event_change_init, cb_event_change, NULL);
+ enigmatic_client_monitor_add(client, cb_event_change_init, cb_event_change, NULL);
ecore_main_loop_begin();
enigmatic_terminate();
- client_del(client);
+ enigmatic_client_del(client);
}
static Eina_Bool
diff --git a/src/bin/examples/cpeew.c b/src/bin/examples/cpeew.c
index 957726b..79c29f3 100644
--- a/src/bin/examples/cpeew.c
+++ b/src/bin/examples/cpeew.c
@@ -103,7 +103,7 @@ elm_main(int argc, char **argv)
colors_init();
- client = client_open();
+ client = enigmatic_client_open();
EINA_SAFETY_ON_NULL_RETURN_VAL(client, 1);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
@@ -131,11 +131,11 @@ elm_main(int argc, char **argv)
elm_win_center(win, 1, 1);
evas_object_show(win);
- client_monitor_add(client, cb_event_change_init, cb_event_change, NULL);
+ enigmatic_client_monitor_add(client, cb_event_change_init, cb_event_change, NULL);
ecore_main_loop_begin();
- client_del(client);
+ enigmatic_client_del(client);
return 0;
}
diff --git a/src/bin/examples/enigmatic_client.c b/src/bin/examples/enigmatic_client.c
index b646444..29a2313 100644
--- a/src/bin/examples/enigmatic_client.c
+++ b/src/bin/examples/enigmatic_client.c
@@ -165,21 +165,21 @@ cb_recording_delay(Enigmatic_Client *client, Enigmatic_Client_Event *event, void
static void
cb_event_change_init(Enigmatic_Client *client, Snapshot *s, void *data)
{
- client_event_callback_add(client, EVENT_CPU_ADD, cb_cpu_add, NULL);
- client_event_callback_add(client, EVENT_CPU_DEL, cb_cpu_del, NULL);
- client_event_callback_add(client, EVENT_BATTERY_ADD, cb_battery_add, NULL);
- client_event_callback_add(client, EVENT_BATTERY_DEL, cb_battery_del, NULL);
- client_event_callback_add(client, EVENT_POWER_SUPPLY_ADD, cb_power_supply_add, NULL);
- client_event_callback_add(client, EVENT_POWER_SUPPLY_DEL, cb_power_supply_del, NULL);
- client_event_callback_add(client, EVENT_SENSOR_ADD, cb_sensor_add, NULL);
- client_event_callback_add(client, EVENT_SENSOR_DEL, cb_sensor_del, NULL);
- client_event_callback_add(client, EVENT_NETWORK_IFACE_ADD, cb_network_iface_add, NULL);
- client_event_callback_add(client, EVENT_NETWORK_IFACE_DEL, cb_network_iface_del, NULL);
- client_event_callback_add(client, EVENT_FILE_SYSTEM_ADD, cb_file_system_add, NULL);
- client_event_callback_add(client, EVENT_FILE_SYSTEM_DEL, cb_file_system_del, NULL);
- client_event_callback_add(client, EVENT_PROCESS_ADD, cb_process_add, NULL);
- client_event_callback_add(client, EVENT_PROCESS_DEL, cb_process_del, NULL);
- client_event_callback_add(client, EVENT_RECORD_DELAY, cb_recording_delay, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_CPU_ADD, cb_cpu_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_CPU_DEL, cb_cpu_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_BATTERY_ADD, cb_battery_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_BATTERY_DEL, cb_battery_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_POWER_SUPPLY_ADD, cb_power_supply_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_POWER_SUPPLY_DEL, cb_power_supply_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_SENSOR_ADD, cb_sensor_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_SENSOR_DEL, cb_sensor_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_NETWORK_IFACE_ADD, cb_network_iface_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_NETWORK_IFACE_DEL, cb_network_iface_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_FILE_SYSTEM_ADD, cb_file_system_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_FILE_SYSTEM_DEL, cb_file_system_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_PROCESS_ADD, cb_process_add, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_PROCESS_DEL, cb_process_del, NULL);
+ enigmatic_client_event_callback_add(client, EVENT_RECORD_DELAY, cb_recording_delay, NULL);
}
static void
@@ -187,31 +187,31 @@ follow(void)
{
if (!enigmatic_launch()) return;
- Enigmatic_Client *client = client_open();
+ Enigmatic_Client *client = enigmatic_client_open();
EINA_SAFETY_ON_NULL_RETURN(client);
- client_monitor_add(client, cb_event_change_init, cb_event_change, NULL);
+ enigmatic_client_monitor_add(client, cb_event_change_init, cb_event_change, NULL);
ecore_main_loop_begin();
enigmatic_terminate();
- client_del(client);
+ enigmatic_client_del(client);
}
static void
history(void)
{
- Enigmatic_Client *client = client_add();
+ Enigmatic_Client *client = enigmatic_client_add();
EINA_SAFETY_ON_NULL_RETURN(client);
cb_event_change_init(client, NULL, NULL);
- client_snapshot_callback_set(client, cb_event_change, NULL);
- client_replay_time_start_set(client, time(NULL) - (2 * 3600));
- client_replay_time_end_set(client, time(NULL));
- client_replay(client);
+ enigmatic_client_snapshot_callback_set(client, cb_event_change, NULL);
+ enigmatic_client_replay_time_start_set(client, time(NULL) - (2 * 3600));
+ enigmatic_client_replay_time_end_set(client, time(NULL));
+ enigmatic_client_replay(client);
- client_del(client);
+ enigmatic_client_del(client);
}
int
diff --git a/src/bin/examples/memories.c b/src/bin/examples/memories.c
index e9116fa..755bfac 100644
--- a/src/bin/examples/memories.c
+++ b/src/bin/examples/memories.c
@@ -80,7 +80,7 @@ cb_event_change(Enigmatic_Client *client, Snapshot *s, void *data)
Meminfo *memory;
Win_Data *pd;
- if (!client_event_is_snapshot(client)) return;
+ if (!enigmatic_client_event_is_snapshot(client)) return;
pd = data;
memory = &s->meminfo;
@@ -242,7 +242,7 @@ elm_main(int argc, char **argv)
if (!enigmatic_launch()) return 1;
- Enigmatic_Client *client = client_open();
+ Enigmatic_Client *client = enigmatic_client_open();
EINA_SAFETY_ON_NULL_RETURN_VAL(client, 1);
Win_Data *pd = calloc(1, sizeof(Win_Data));
@@ -278,11 +278,11 @@ elm_main(int argc, char **argv)
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, cb_win_del, pd);
- client_monitor_add(client, cb_event_change_init, cb_event_change, pd);
+ enigmatic_client_monitor_add(client, cb_event_change_init, cb_event_change, pd);
ecore_main_loop_begin();
- client_del(client);
+ enigmatic_client_del(client);
return 0;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
