diff options
author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-05-20 14:41:28 +0000 |
---|---|---|
committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-05-20 14:41:28 +0000 |
commit | 7b3c726991f0f060ca18c576fc7816b930435240 (patch) | |
tree | 1b6e5c7396fd89cd81baa018af6080c5349e1c6b /hardinfo2/arch/common/zlib.h | |
parent | cbd8b0d401add58a06d82c7a5d7fb22b53d80714 (diff) |
- Add binreloc support.
- Add users information.
- Add ppc64 and mips64 support.
- Fix loadgraph autoscaling (should be usable now! :)
- Misc cosmetic changes.
- Misc wording changes.
Diffstat (limited to 'hardinfo2/arch/common/zlib.h')
-rw-r--r-- | hardinfo2/arch/common/zlib.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hardinfo2/arch/common/zlib.h b/hardinfo2/arch/common/zlib.h index f68d60f4..2a1007ed 100644 --- a/hardinfo2/arch/common/zlib.h +++ b/hardinfo2/arch/common/zlib.h @@ -29,7 +29,7 @@ benchmark_zlib(void) if (!libz) { libz = g_module_open("/lib/libz.so", G_MODULE_BIND_LAZY); if (!libz) { - g_print("%s\n", g_module_error()); + g_warning("Cannot load ZLib: %s", g_module_error()); return g_strdup("[Error]\n" "ZLib not found="); } @@ -51,9 +51,13 @@ benchmark_zlib(void) gdouble elapsed = 0; gchar src[65536], *tmpsrc; glong srclen = 65536; + gchar *bdata_path; + + bdata_path = g_strdup_printf("%s/hardinfo/benchmark.data", + gbr_find_data_dir(PREFIX)); - if (!g_file_get_contents(PREFIX "benchmark.data", - &tmpsrc, NULL, NULL)) { + if (!g_file_get_contents(bdata_path, &tmpsrc, NULL, NULL)) { + g_free(bdata_path); return g_strdup("[Error]\n" PREFIX "benchmark.data not found=\n"); } @@ -77,6 +81,7 @@ benchmark_zlib(void) } g_timer_destroy(timer); + g_free(bdata_path); gchar *retval = g_strdup_printf("[Results <i>(in seconds; lower is better)</i>]\n" "<b>This Machine</b>=<b>%.2f</b>\n", elapsed); |