comparison: libpurple/protocols/myspace/message.c
libpurple/protocols/myspace/message.c
- changeset 22394
- e91e407c89c8
- parent 20228
- ce019944d765
- child 22441
- b7251b10326a
equal
deleted
inserted
replaced
| 22393:b4f54ad21ffa | 22394:e91e407c89c8 |
|---|---|
| 48 gchar * | 48 gchar * |
| 49 msim_escape(const gchar *msg) | 49 msim_escape(const gchar *msg) |
| 50 { | 50 { |
| 51 GString *gs; | 51 GString *gs; |
| 52 guint i, j; | 52 guint i, j; |
| 53 guint msg_len; | |
| 53 | 54 |
| 54 gs = g_string_new(""); | 55 gs = g_string_new(""); |
| 55 | 56 msg_len = strlen(msg); |
| 56 | 57 |
| 57 for (i = 0; i < strlen(msg); ++i) { | 58 for (i = 0; i < msg_len; ++i) { |
| 58 struct MSIM_ESCAPE_REPLACEMENT *replacement; | 59 struct MSIM_ESCAPE_REPLACEMENT *replacement; |
| 59 gchar *replace; | 60 gchar *replace; |
| 60 | 61 |
| 61 replace = NULL; | 62 replace = NULL; |
| 62 | 63 |
| 91 gchar * | 92 gchar * |
| 92 msim_unescape(const gchar *msg) | 93 msim_unescape(const gchar *msg) |
| 93 { | 94 { |
| 94 GString *gs; | 95 GString *gs; |
| 95 guint i, j; | 96 guint i, j; |
| 97 guint msg_len; | |
| 96 | 98 |
| 97 gs = g_string_new(""); | 99 gs = g_string_new(""); |
| 98 | 100 msg_len = strlen(msg); |
| 99 for (i = 0; i < strlen(msg); ++i) { | 101 |
| 102 for (i = 0; i < msg_len; ++i) { | |
| 100 struct MSIM_ESCAPE_REPLACEMENT *replacement; | 103 struct MSIM_ESCAPE_REPLACEMENT *replacement; |
| 101 gchar replace; | 104 gchar replace; |
| 102 | 105 |
| 103 replace = msg[i]; | 106 replace = msg[i]; |
| 104 | 107 |
| 105 for (j = 0; (replacement = &msim_escape_replacements[j]) && | 108 for (j = 0; (replacement = &msim_escape_replacements[j]) && |
| 106 replacement->code != NULL; ++j) { | 109 replacement->code != NULL; ++j) { |
| 107 if (msg[i] == replacement->code[0] && | 110 if (msg[i] == replacement->code[0] && |
| 108 i + 1 < strlen(msg) && | 111 i + 1 < msg_len && |
| 109 msg[i + 1] == replacement->code[1]) { | 112 msg[i + 1] == replacement->code[1]) { |
| 110 replace = replacement->text; | 113 replace = replacement->text; |
| 111 ++i; | 114 ++i; |
| 112 break; | 115 break; |
| 113 } | 116 } |
