mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-11-18 11:05:18 +00:00
Fix CRIT_ERR everywhere
This commit is contained in:
parent
7e7a193b74
commit
922db9af82
@ -65,7 +65,7 @@ void update_audacious(void)
|
||||
* structure when the main thread's update cycle fires. */
|
||||
if (!info.audacious.p_timed_thread) {
|
||||
if (create_audacious_thread() != 0) {
|
||||
CRIT_ERR("unable to create audacious thread!");
|
||||
CRIT_ERR(NULL, NULL, "unable to create audacious thread!");
|
||||
}
|
||||
timed_thread_register(info.audacious.p_timed_thread,
|
||||
&info.audacious.p_timed_thread);
|
||||
@ -140,12 +140,12 @@ void *audacious_thread_func(void *pvoid)
|
||||
g_type_init();
|
||||
connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
|
||||
if (!connection) {
|
||||
CRIT_ERR("unable to establish dbus connection");
|
||||
CRIT_ERR(NULL, NULL, "unable to establish dbus connection");
|
||||
}
|
||||
session = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE,
|
||||
AUDACIOUS_DBUS_PATH, AUDACIOUS_DBUS_INTERFACE);
|
||||
if (!session) {
|
||||
CRIT_ERR("unable to create dbus proxy");
|
||||
CRIT_ERR(NULL, NULL, "unable to create dbus proxy");
|
||||
}
|
||||
#endif /* AUDACIOUS_LEGACY */
|
||||
|
||||
|
@ -91,7 +91,7 @@ void get_ibm_acpi_fan(char *p_client_buffer, size_t client_buffer_size)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
CRIT_ERR(NULL, NULL, "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
"ibm* from your "PACKAGE_NAME" config file.", fan, strerror(errno));
|
||||
}
|
||||
|
||||
@ -155,7 +155,7 @@ void get_ibm_acpi_temps(void)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
CRIT_ERR(NULL, NULL, "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
"ibm* from your "PACKAGE_NAME" config file.", thermal, strerror(errno));
|
||||
}
|
||||
|
||||
@ -203,7 +203,7 @@ void get_ibm_acpi_volume(char *p_client_buffer, size_t client_buffer_size)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
CRIT_ERR(NULL, NULL, "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
"ibm* from your "PACKAGE_NAME" config file.", volume, strerror(errno));
|
||||
}
|
||||
|
||||
@ -252,7 +252,7 @@ void get_ibm_acpi_brightness(char *p_client_buffer, size_t client_buffer_size)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
CRIT_ERR("can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
CRIT_ERR(NULL, NULL, "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
|
||||
"ibm* from your "PACKAGE_NAME" config file.", filename, strerror(errno));
|
||||
}
|
||||
|
||||
|
@ -327,14 +327,14 @@ void get_cpu_count()
|
||||
|
||||
info.cpu_usage = malloc(info.cpu_count * sizeof(float));
|
||||
if (info.cpu_usage == NULL) {
|
||||
CRIT_ERR("malloc");
|
||||
CRIT_ERR(NULL, NULL, "malloc");
|
||||
}
|
||||
|
||||
#ifndef OLDCPU
|
||||
assert(fresh == NULL); /* XXX Is this leaking memory? */
|
||||
/* XXX Where shall I free this? */
|
||||
if (NULL == (fresh = calloc(cpu_count, sizeof(int64_t) * CPUSTATES))) {
|
||||
CRIT_ERR("calloc");
|
||||
CRIT_ERR(NULL, NULL, "calloc");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user