devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Cleanup char* to auto_gchar gchar* for prefs_get_string

Browse Source 
Necessity explained in #1819
This commit is contained in:
John Hernandez
2023-06-13 22:01:08 +02:00
parent 1c102fec27
commit 4a70f5f513
19 changed files with 133 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unittests/test_cmd_otr.c
View File

@@ -58,11 +58,10 @@ cmd_otr_log_on_enables_logging(void** state)
expect_cons_show("OTR messages will be logged as plaintext.");
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
char* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
auto_gchar gchar* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
assert_true(result);
assert_string_equal("on", pref_otr_log);
g_free(pref_otr_log);
}
void
@@ -89,11 +88,10 @@ cmd_otr_log_off_disables_logging(void** state)
expect_cons_show("OTR message logging disabled.");
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
char* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
auto_gchar gchar* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
assert_true(result);
assert_string_equal("off", pref_otr_log);
g_free(pref_otr_log);
}
void
@@ -106,11 +104,10 @@ cmd_otr_redact_redacts_logging(void** state)
expect_cons_show("OTR messages will be logged as '[redacted]'.");
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
char* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
auto_gchar gchar* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
assert_true(result);
assert_string_equal("redact", pref_otr_log);
g_free(pref_otr_log);
}
void

27
tests/unittests/test_cmd_presence.c
View File

@@ -68,11 +68,10 @@ cmd_presence_console_sets_all(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
assert_string_equal("all", setting);
assert_true(result);
g_free(setting);
}
void
@@ -84,11 +83,10 @@ cmd_presence_console_sets_online(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
assert_string_equal("online", setting);
assert_true(result);
g_free(setting);
}
void
@@ -100,11 +98,10 @@ cmd_presence_console_sets_none(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
assert_string_equal("none", setting);
assert_true(result);
g_free(setting);
}
void
@@ -116,11 +113,10 @@ cmd_presence_chat_sets_all(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_CHAT);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
assert_string_equal("all", setting);
assert_true(result);
g_free(setting);
}
void
@@ -132,11 +128,10 @@ cmd_presence_chat_sets_online(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_CHAT);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
assert_string_equal("online", setting);
assert_true(result);
g_free(setting);
}
void
@@ -148,11 +143,10 @@ cmd_presence_chat_sets_none(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_CHAT);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
assert_string_equal("none", setting);
assert_true(result);
g_free(setting);
}
void
@@ -164,11 +158,10 @@ cmd_presence_room_sets_all(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_MUC);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
assert_string_equal("all", setting);
assert_true(result);
g_free(setting);
}
void
@@ -180,11 +173,10 @@ cmd_presence_room_sets_online(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_MUC);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
assert_string_equal("online", setting);
assert_true(result);
g_free(setting);
}
void
@@ -196,9 +188,8 @@ cmd_presence_room_sets_none(void** state)
gboolean result = cmd_presence(NULL, CMD_PRESENCE, args);
char* setting = prefs_get_string(PREF_STATUSES_MUC);
auto_gchar gchar* setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
assert_string_equal("none", setting);
assert_true(result);
g_free(setting);
}

6
tests/unittests/test_preferences.c
View File

@@ -11,7 +11,7 @@
void
statuses_console_defaults_to_all(void** state)
{
char* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
gchar* setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
assert_string_equal("all", setting);
@@ -21,7 +21,7 @@ statuses_console_defaults_to_all(void** state)
void
statuses_chat_defaults_to_all(void** state)
{
char* setting = prefs_get_string(PREF_STATUSES_CHAT);
gchar* setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
assert_string_equal("none", setting);
@@ -31,7 +31,7 @@ statuses_chat_defaults_to_all(void** state)
void
statuses_muc_defaults_to_all(void** state)
{
char* setting = prefs_get_string(PREF_STATUSES_MUC);
gchar* setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
assert_string_equal("none", setting);