pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-05 01:03:14 +02:00
Code Activity

core: rename function util_get_uptime to util_get_time_diff

Browse Source 
The two times must be sent as parameters, which makes the function not specific
to uptime. It is now easier to test the function in unit tests.
This commit is contained in:
Sébastien Helleu
2020-02-02 13:57:39 +01:00
parent 4e2718d234
commit 27266ccd02
4 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/plugin-api-info.c
+7 -3
View File
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <time.h>
#include "../core/weechat.h"
#include "../core/wee-config.h"
@@ -694,7 +695,8 @@ plugin_api_info_uptime_cb (const void *pointer, void *data,
if (!arguments || !arguments[0])
{
/* return uptime with format: "days:hh:mm:ss" */
util_get_uptime (NULL, &days, &hours, &minutes, &seconds);
util_get_time_diff (weechat_first_start_time, time (NULL),
NULL, &days, &hours, &minutes, &seconds);
snprintf (value, sizeof (value), "%d:%02d:%02d:%02d",
days, hours, minutes, seconds);
return strdup (value);
@@ -703,7 +705,8 @@ plugin_api_info_uptime_cb (const void *pointer, void *data,
if (strcmp (arguments, "days") == 0)
{
/* return the number of days */
util_get_uptime (NULL, &days, NULL, NULL, NULL);
util_get_time_diff (weechat_first_start_time, time (NULL),
NULL, &days, NULL, NULL, NULL);
snprintf (value, sizeof (value), "%d", days);
return strdup (value);
}
@@ -711,7 +714,8 @@ plugin_api_info_uptime_cb (const void *pointer, void *data,
if (strcmp (arguments, "seconds") == 0)
{
/* return the number of seconds */
util_get_uptime (&total_seconds, NULL, NULL, NULL, NULL);
util_get_time_diff (weechat_first_start_time, time (NULL),
&total_seconds, NULL, NULL, NULL, NULL);
snprintf (value, sizeof (value), "%lld", (long long)total_seconds);
return strdup (value);
}