diff options
author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-06-16 14:09:52 +0000 |
---|---|---|
committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-06-16 14:09:52 +0000 |
commit | 9f4da1891acbb7ae581285a9cd55171b10459de1 (patch) | |
tree | 42dc61d988e97480d630c08663b56aec25bf2208 /hardinfo2/arch | |
parent | b4fbe4dab0f2f7ffdd39ca9caafbd9de8c5a342a (diff) |
Fix compilation warnings, include license file
Diffstat (limited to 'hardinfo2/arch')
-rw-r--r-- | hardinfo2/arch/linux/common/samba.h | 18 | ||||
-rw-r--r-- | hardinfo2/arch/linux/x86/processor.h | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/hardinfo2/arch/linux/common/samba.h b/hardinfo2/arch/linux/common/samba.h index 9da8518b..5f5ecbe5 100644 --- a/hardinfo2/arch/linux/common/samba.h +++ b/hardinfo2/arch/linux/common/samba.h @@ -25,6 +25,7 @@ scan_samba_shared_directories(void) gchar **groups; gchar *smbconf; gsize length; + gint i = 0; if (smb_shares_list) { g_free(smb_shares_list); @@ -51,16 +52,15 @@ scan_samba_shared_directories(void) smb_shares_list = g_strdup(""); groups = g_key_file_get_groups(keyfile, NULL); - gchar **_groups = groups; - while (*groups) { - if (g_key_file_has_key(keyfile, *groups, "path", NULL) && - g_key_file_has_key(keyfile, *groups, "available", NULL)) { + while (groups[i]) { + if (g_key_file_has_key(keyfile, groups[i], "path", NULL) && + g_key_file_has_key(keyfile, groups[i], "available", NULL)) { - gchar *available = g_key_file_get_string(keyfile, *groups, "available", NULL); + gchar *available = g_key_file_get_string(keyfile, groups[i], "available", NULL); if (g_str_equal(available, "yes")) { - gchar *path = g_key_file_get_string(keyfile, *groups, "path", NULL); - smb_shares_list = g_strconcat(smb_shares_list, *groups, "=", + gchar *path = g_key_file_get_string(keyfile, groups[i], "path", NULL); + smb_shares_list = g_strconcat(smb_shares_list, groups[i], "=", path, "\n", NULL); g_free(path); } @@ -68,10 +68,10 @@ scan_samba_shared_directories(void) g_free(available); } - *groups++; + i++; } - g_strfreev(_groups); + g_strfreev(groups); cleanup: g_key_file_free(keyfile); diff --git a/hardinfo2/arch/linux/x86/processor.h b/hardinfo2/arch/linux/x86/processor.h index 571943f6..aba623bf 100644 --- a/hardinfo2/arch/linux/x86/processor.h +++ b/hardinfo2/arch/linux/x86/processor.h @@ -235,22 +235,22 @@ processor_get_capabilities_from_flags(gchar * strflags) /* FIXME: * Separate between processor capabilities, additional instructions and whatnot. */ gchar **flags, **old; gchar *tmp = ""; - gint i; + gint i, j = 0; flags = g_strsplit(strflags, " ", 0); old = flags; - while (*flags) { + while (flags[j]) { gchar *meaning = ""; for (i = 0; flag_meaning[i].name != NULL; i++) { - if (!strcmp(*flags, flag_meaning[i].name)) { + if (!strcmp(flags[j], flag_meaning[i].name)) { meaning = flag_meaning[i].meaning; break; } } - tmp = g_strdup_printf("%s%s=%s\n", tmp, *flags, meaning); - *flags++; + tmp = g_strdup_printf("%s%s=%s\n", tmp, flags[j], meaning); + j++; } g_strfreev(old); |