aboutsummaryrefslogtreecommitdiff
path: root/hardinfo2
diff options
context:
space:
mode:
Diffstat (limited to 'hardinfo2')
-rw-r--r--hardinfo2/hardinfo.c12
-rw-r--r--hardinfo2/pci_util.c4
-rw-r--r--hardinfo2/storage_util.c4
-rw-r--r--hardinfo2/usb_util.c2
-rw-r--r--hardinfo2/util.c14
-rw-r--r--hardinfo2/vendor.c6
6 files changed, 21 insertions, 21 deletions
diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c
index 2a5bc1fa..bf450a5e 100644
--- a/hardinfo2/hardinfo.c
+++ b/hardinfo2/hardinfo.c
@@ -35,19 +35,19 @@ int main(int argc, char **argv)
GSList *modules;
setlocale(LC_ALL, "");
- bindtextdomain("hardinfo", LOCALEDIR);
- textdomain("hardinfo");
+ bindtextdomain("hardinfo2", LOCALEDIR);
+ textdomain("hardinfo2");
- DEBUG("HardInfo version " VERSION ". Debug version.");
+ DEBUG("Hardinfo2 version " VERSION ". Debug version.");
/* parse all command line parameters */
parameters_init(&argc, &argv, &params);
/* show version information and quit */
if (params.show_version) {
- g_print("HardInfo version " VERSION "\n");
+ g_print("Hardinfo2 version " VERSION "\n");
g_print
- (_(/*/ %d will be latest year of copyright*/ "Copyright (C) 2003-%d L. A. F. Pereira. See COPYING for details.\n\n"), HARDINFO_COPYRIGHT_LATEST_YEAR );
+ (_(/*/ %d will be latest year of copyright*/ "Copyright (C) 2003-2023 L. A. F. Pereira. 2024-%d Hardinfo2 Project.\n\n"), HARDINFO2_COPYRIGHT_LATEST_YEAR );
g_print(_("Compile-time options:\n"
" Release version: %s (%s)\n"
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
/* initialize the binreloc library, so we can load program data */
if (!binreloc_init(FALSE))
g_error(_("Failed to find runtime data.\n\n"
- "\342\200\242 Is HardInfo correctly installed?\n"
+ "\342\200\242 Is HardInfo2 correctly installed?\n"
"\342\200\242 See if %s and %s exists and you have read permission."),
PREFIX, LIBPREFIX);
diff --git a/hardinfo2/pci_util.c b/hardinfo2/pci_util.c
index c2305363..7dbc909d 100644
--- a/hardinfo2/pci_util.c
+++ b/hardinfo2/pci_util.c
@@ -48,9 +48,9 @@ const gchar *find_pci_ids_file() {
char *file_search_order[] = {
g_strdup("/usr/share/hwdata/pci.ids"),
g_strdup("/usr/share/misc/pci.ids"),
- g_build_filename(g_get_user_config_dir(), "hardinfo", "pci.ids", NULL),
+ g_build_filename(g_get_user_config_dir(), "hardinfo2", "pci.ids", NULL),
g_build_filename(params.path_data, "pci.ids", NULL),
- g_build_filename(g_get_user_config_dir(), "hardinfo", "pci.ids.min", NULL),
+ g_build_filename(g_get_user_config_dir(), "hardinfo2", "pci.ids.min", NULL),
g_build_filename(params.path_data, "pci.ids.min", NULL),
NULL
};
diff --git a/hardinfo2/storage_util.c b/hardinfo2/storage_util.c
index 7e61d336..e7006069 100644
--- a/hardinfo2/storage_util.c
+++ b/hardinfo2/storage_util.c
@@ -10,7 +10,7 @@ gchar *oui_ids_file = NULL;
void find_sdcard_ids_file() {
if (sdcard_ids_file) return;
char *file_search_order[] = {
- g_build_filename(g_get_user_config_dir(), "hardinfo", "sdcard.ids", NULL),
+ g_build_filename(g_get_user_config_dir(), "hardinfo2", "sdcard.ids", NULL),
g_build_filename(params.path_data, "sdcard.ids", NULL),
NULL
};
@@ -26,7 +26,7 @@ void find_sdcard_ids_file() {
void find_oui_ids_file() {
if (oui_ids_file) return;
char *file_search_order[] = {
- g_build_filename(g_get_user_config_dir(), "hardinfo", "ieee_oui.ids", NULL),
+ g_build_filename(g_get_user_config_dir(), "hardinfo2", "ieee_oui.ids", NULL),
g_build_filename(params.path_data, "ieee_oui.ids", NULL),
NULL
};
diff --git a/hardinfo2/usb_util.c b/hardinfo2/usb_util.c
index cf3ece40..d9f943b1 100644
--- a/hardinfo2/usb_util.c
+++ b/hardinfo2/usb_util.c
@@ -320,7 +320,7 @@ static gboolean usb_get_interface_sysfs(int conf, int number,
static void find_usb_ids_file() {
if (usb_ids_file) return;
char *file_search_order[] = {
- g_build_filename(g_get_user_config_dir(), "hardinfo", "usb.ids", NULL),
+ g_build_filename(g_get_user_config_dir(), "hardinfo2", "usb.ids", NULL),
g_build_filename(params.path_data, "usb.ids", NULL),
NULL
};
diff --git a/hardinfo2/util.c b/hardinfo2/util.c
index 38c7bce1..6ed326d4 100644
--- a/hardinfo2/util.c
+++ b/hardinfo2/util.c
@@ -307,11 +307,11 @@ gboolean binreloc_init(gboolean try_hardcoded)
DEBUG("done, trying to use binreloc paths.");
tmp = gbr_find_data_dir(PREFIX);
- params.path_data = g_build_filename(tmp, "hardinfo", NULL);
+ params.path_data = g_build_filename(tmp, "hardinfo2", NULL);
g_free(tmp);
tmp = gbr_find_lib_dir(PREFIX);
- params.path_lib = g_build_filename(tmp, "hardinfo", NULL);
+ params.path_lib = g_build_filename(tmp, "hardinfo2", NULL);
g_free(tmp);
}
@@ -319,7 +319,7 @@ gboolean binreloc_init(gboolean try_hardcoded)
DEBUG(" lib: %s", params.path_lib);
DEBUG(" data: %s", params.path_data);
- /* Try to see if the uidefs.xml file isn't missing. This isn't the
+ /* Try to see if the benchmark test data file isn't missing. This isn't the
definitive test, but it should do okay for most situations. */
tmp = g_build_filename(params.path_data, "benchmark.data", NULL);
if (!g_file_test(tmp, G_FILE_TEST_EXISTS)) {
@@ -546,7 +546,7 @@ void parameters_init(int *argc, char ***argv, ProgramParameters * param)
// TODO: fmt_opts: FMT_OPT_ATERM, FMT_OPT_HTML, FMT_OPT_PANGO...
param->fmt_opts = FMT_OPT_NONE;
- gchar *confdir = g_build_filename(g_get_user_config_dir(), "hardinfo", NULL);
+ gchar *confdir = g_build_filename(g_get_user_config_dir(), "hardinfo2", NULL);
if (!g_file_test(confdir, G_FILE_TEST_EXISTS)) {
mkdir(confdir, 0744);
}
@@ -557,7 +557,7 @@ gboolean ui_init(int *argc, char ***argv)
{
DEBUG("initializing gtk+ UI");
- g_set_application_name("HardInfo");
+ g_set_application_name("HardInfo2");
g_log_set_handler(NULL,
G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL |
G_LOG_LEVEL_ERROR, log_handler, NULL);
@@ -928,7 +928,7 @@ static GSList *modules_check_deps(GSList * modules)
modules = g_slist_prepend(modules, mod);
modules = modules_check_deps(modules); /* re-check dependencies */
} else {
- g_error("HardInfo cannot run without loading the additional module.");
+ g_error("HardInfo2 cannot run without loading the additional module.");
exit(1);
}
@@ -983,7 +983,7 @@ static GSList *modules_load(gchar ** module_list)
params.path_lib);
} else {
g_error
- (_("No module could be loaded. Please use hardinfo -l to list all avai"
+ (_("No module could be loaded. Please use hardinfo2 -l to list all avai"
"lable modules and try again with a valid module list."));
}
diff --git a/hardinfo2/vendor.c b/hardinfo2/vendor.c
index 3f55d987..bd3f52fe 100644
--- a/hardinfo2/vendor.c
+++ b/hardinfo2/vendor.c
@@ -264,11 +264,11 @@ void vendor_init(void)
char *file_search_order[] = {
/* new format */
- g_build_filename(g_get_user_config_dir(), "hardinfo", "vendor.ids", NULL),
+ g_build_filename(g_get_user_config_dir(), "hardinfo2", "vendor.ids", NULL),
g_build_filename(params.path_data, "vendor.ids", NULL),
/* old format */
- g_build_filename(g_get_user_config_dir(), "hardinfo", "vendor.conf", NULL),
- g_build_filename(g_get_home_dir(), ".hardinfo", "vendor.conf", NULL), /* old place */
+ g_build_filename(g_get_user_config_dir(), "hardinfo2", "vendor.conf", NULL),
+ g_build_filename(g_get_home_dir(), ".hardinfo2", "vendor.conf", NULL), /* old place */
g_build_filename(params.path_data, "vendor.conf", NULL),
NULL
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 23:53:42 +0000