summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/computer/ubuntu_flavors.c6
-rw-r--r--modules/devices/devicetree.c5
-rw-r--r--modules/devices/dmi_memory.c25
-rw-r--r--modules/devices/x86/processor.c6
4 files changed, 21 insertions, 21 deletions
diff --git a/modules/computer/ubuntu_flavors.c b/modules/computer/ubuntu_flavors.c
index ff64eb56..20e83c82 100644
--- a/modules/computer/ubuntu_flavors.c
+++ b/modules/computer/ubuntu_flavors.c
@@ -19,9 +19,7 @@
#include <hardinfo.h>
#include "distro_flavors.h"
-
-#include "dt_util.h" /* for appf() */
-#define SEQ(s,m) (g_strcmp0(s, m) == 0)
+#include "util_sysobj.h" /* for appfsp() */
static const UbuntuFlavor ubuntu_flavors[] = {
{ "Vanilla Server", "distros/ubuntu.svg", "https://ubuntu.org", "ubuntu-server" },
@@ -59,7 +57,7 @@ GSList *ubuntu_flavors_scan(void) {
gchar *cmd_line = g_strdup("apt-cache policy");
int i;
for(i = 0; ubuntu_flavors[i].base.name; i++) {
- cmd_line = appf(cmd_line, "%s", ubuntu_flavors[i].package);
+ cmd_line = appfsp(cmd_line, "%s", ubuntu_flavors[i].package);
}
if (!i)
return NULL;
diff --git a/modules/devices/devicetree.c b/modules/devices/devicetree.c
index 1f2549dd..4fd52cbb 100644
--- a/modules/devices/devicetree.c
+++ b/modules/devices/devicetree.c
@@ -28,6 +28,7 @@
#include "devices.h"
#include "cpu_util.h"
#include "dt_util.h"
+#include "appf.h"
gchar *dtree_info = NULL;
const char *dtree_mem_str = NULL; /* used by memory devices when nothing else is available */
@@ -267,12 +268,12 @@ static void add_keys(dtr *dt, char *np) {
static char *msg_section(dtr *dt, int dump) {
gchar *aslbl = NULL;
gchar *messages = dtr_messages(dt);
- gchar *ret = g_strdup_printf("[%s]\n", _("Messages"));
+ gchar *ret = g_strdup_printf("[%s]", _("Messages"));
gchar **lines = g_strsplit(messages, "\n", 0);
int i = 0;
while(lines[i] != NULL) {
aslbl = hardinfo_clean_label(lines[i], 0);
- ret = appf(ret, "%s=\n", aslbl);
+ ret = appfnl(ret, "%s=", aslbl);
g_free(aslbl);
i++;
}
diff --git a/modules/devices/dmi_memory.c b/modules/devices/dmi_memory.c
index 33181de2..8e9e25c3 100644
--- a/modules/devices/dmi_memory.c
+++ b/modules/devices/dmi_memory.c
@@ -26,7 +26,7 @@
extern const char *dtree_mem_str; /* in devicetree.c */
-#include "dt_util.h" /* for appf() */
+#include "util_sysobj.h" /* for appfsp() */
#define dmi_spd_msg(...) /* fprintf (stderr, __VA_ARGS__) */
typedef uint64_t dmi_mem_size;
@@ -51,7 +51,6 @@ static const char empty_icon[] = "module.png";
#define UNKIFNULL2(f) ((f) ? f : _("(Unknown)"))
#define UNKIFEMPTY2(f) ((*f) ? f : _("(Unknown)"))
-#define SEQ(s,m) (g_strcmp0(s, m) == 0)
#define STR_IGNORE(str, ignore) if (SEQ(str, ignore)) { *str = 0; null_if_empty(&str); }
const char *problem_marker() {
@@ -682,7 +681,7 @@ gchar *memory_devices_get_info() {
for(i = 1; i < N_RAM_TYPES; i++) {
int bit = 1 << (i-1);
if (a->ram_types & bit)
- types_str = appf(types_str, "%s", GET_RAM_TYPE_STR(i));
+ types_str = appfsp(types_str, "%s", GET_RAM_TYPE_STR(i));
}
gchar *details = g_strdup_printf("[%s]\n"
@@ -824,7 +823,7 @@ gchar *memory_devices_get_info() {
for(i = 1; i < N_RAM_TYPES; i++) {
int bit = 1 << (i-1);
if (mem->spd_ram_types & bit)
- types_str = appf(types_str, "%s", GET_RAM_TYPE_STR(i));
+ types_str = appfsp(types_str, "%s", GET_RAM_TYPE_STR(i));
}
gchar *details = g_strdup_printf("[%s]\n"
@@ -924,7 +923,7 @@ gchar *memory_devices_get_system_memory_types_str() {
for(i = 1; i < N_RAM_TYPES; i++) {
int bit = 1 << (i-1);
if (rtypes & bit)
- types_str = appf(types_str, "%s", GET_RAM_TYPE_STR(i));
+ types_str = appfsp(types_str, "%s", GET_RAM_TYPE_STR(i));
}
ret = g_strdup(UNKIFNULL2(types_str));
g_free(types_str);
@@ -954,9 +953,9 @@ static gchar *note_state = NULL;
gboolean memory_devices_hinote(const char **msg) {
- gchar *want_dmi = _(" <b><i>dmidecode</i></b> utility available\n");
- gchar *want_root = _(" ... <i>and</i> HardInfo running with superuser privileges\n");
- gchar *want_eeprom = _(" <b><i>eeprom</i></b> module loaded (for SDR, DDR, DDR2, DDR3)\n");
+ gchar *want_dmi = _(" <b><i>dmidecode</i></b> utility available");
+ gchar *want_root = _(" ... <i>and</i> HardInfo running with superuser privileges");
+ gchar *want_eeprom = _(" <b><i>eeprom</i></b> module loaded (for SDR, DDR, DDR2, DDR3)");
gchar *want_ee1004 = _(" ... <i>or</i> <b><i>ee1004</i></b> module loaded <b>and configured!</b> (for DDR4)");
gboolean has_root = (getuid() == 0);
@@ -968,11 +967,11 @@ gboolean memory_devices_hinote(const char **msg) {
char *bullet_no = "<big><b>\u2022<tt> </tt></b></big>";
g_free(note_state);
- note_state = g_strdup(_("Memory information requires <b>one or both</b> of the following:\n"));
- note_state = appf(note_state, "<tt>1. </tt>%s%s", has_dmi ? bullet_yes : bullet_no, want_dmi);
- note_state = appf(note_state, "<tt> </tt>%s%s", has_root ? bullet_yes : bullet_no, want_root);
- note_state = appf(note_state, "<tt>2. </tt>%s%s", has_eeprom ? bullet_yes : bullet_no, want_eeprom);
- note_state = appf(note_state, "<tt> </tt>%s%s", has_ee1004 ? bullet_yes : bullet_no, want_ee1004);
+ note_state = g_strdup(_("Memory information requires <b>one or both</b> of the following:"));
+ note_state = appfnl(note_state, "<tt>1. </tt>%s%s", has_dmi ? bullet_yes : bullet_no, want_dmi);
+ note_state = appfnl(note_state, "<tt> </tt>%s%s", has_root ? bullet_yes : bullet_no, want_root);
+ note_state = appfnl(note_state, "<tt>2. </tt>%s%s", has_eeprom ? bullet_yes : bullet_no, want_eeprom);
+ note_state = appfnl(note_state, "<tt> </tt>%s%s", has_ee1004 ? bullet_yes : bullet_no, want_ee1004);
gboolean ddr3_ee1004 = ((dmi_ram_types & (1<<DDR3_SDRAM)) && has_ee1004);
diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c
index 768a70fa..538206c1 100644
--- a/modules/devices/x86/processor.c
+++ b/modules/devices/x86/processor.c
@@ -19,7 +19,7 @@
#include "hardinfo.h"
#include "devices.h"
#include "cpu_util.h"
-
+#include "nice_name.h"
#include "x86_data.h"
#include "x86_data.c"
@@ -567,6 +567,8 @@ GSList *processor_scan(void)
if (processor->cpufreq->cpukhz_max)
processor->cpu_mhz = processor->cpufreq->cpukhz_max / 1000;
+
+ nice_name_x86_cpuid_model_string(processor->model_name);
}
return procs;
@@ -648,7 +650,7 @@ gchar *processor_get_detailed_info(Processor * processor)
processor->model,
processor->stepping,
processor->strmodel,
- _("Vendor"), idle_free(vendor_get_link(processor->vendor_id)),
+ _("Vendor"), (char*)idle_free(vendor_get_link(processor->vendor_id)),
_("Microcode Version"), processor->microcode,
_("Configuration"),
_("Cache Size"), processor->cache_size, _("kb"),
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 17:46:53 +0000