Changeset c11b68a

Timestamp:

2016-12-27T00:37:50Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

398b3198

Parents:

faa7abb6

git-author:

dequis <dx@…> (27-12-16 00:37:12)

git-committer:

dequis <dx@…> (27-12-16 00:37:50)

Message:

purple: fix -Werror=format-string in chat settings code

This one was caught by the debian build scripts in travis. I had
format-security in my local cflags, not format-string. Welp.

File:

• protocols/purple/purple.c (modified) (2 diffs)

protocols/purple/purple.c

@@ -819 +819 @@
                 if (pce->required && !g_hash_table_lookup(chat_hash, pce->identifier)) {
                         if (!missing_settings) {
-                                missing_settings = g_string_new(NULL);
-                                g_string_printf(missing_settings,
-                                        "Can't join %s. The following settings are required: ", room);
+                                missing_settings = g_string_sized_new(32);
                         }
                         g_string_append_printf(missing_settings, "%s, ", pce->identifier);
@@ -835 +833 @@
                 g_string_truncate(missing_settings, missing_settings->len - 2);
 
-                imcb_error(ic, missing_settings->str);
+                imcb_error(ic, "Can't join %s. The following settings are required: %s", room, missing_settings->str);
 
                 g_string_free(missing_settings, TRUE);