Changeset 7a9d968 for otr.c

Timestamp:

2018-03-10T11:30:39Z (6 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

File:

• otr.c (modified) (3 diffs)

otr.c

@@ -878 +878 @@
         case OTRL_SMPEVENT_ASK_FOR_SECRET:
                 irc_rootmsg(irc, "smp: initiated by %s"
-                            " - respond with \x02otr smp %s <secret>\x02",
+                            " - respond with \x02otr smp %s \"<secret>\"\x02",
                             u->nick, u->nick);
                 break;
@@ -884 +884 @@
                 irc_rootmsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick,
                             question);
-                irc_rootmsg(irc, "smp: respond with \x02otr smp %s <answer>\x02",
+                irc_rootmsg(irc, "smp: respond with \x02otr smp %s \"<answer>\"\x02",
                             u->nick);
                 break;
@@ -1514 +1514 @@
                         }
                 }
-                assert(l != NULL);  /* a match should always be found */
+                g_return_val_if_fail(l, NULL);
                 if (!l) {
                         return NULL;