comparison: libpurple/util.c
libpurple/util.c
- branch
- soc.2013.gobjectification.plugins
- changeset 36858
- 920cf8db7c68
- parent 36723
- d5014e354e8f
- parent 35001
- 85144a4a7942
- child 36862
- 7b6f1efa00c8
equal
deleted
inserted
replaced
| 36857:79d57b15c8cc | 36858:920cf8db7c68 |
|---|---|
| 164 g_return_val_if_fail(len > 0, NULL); | 164 g_return_val_if_fail(len > 0, NULL); |
| 165 | 165 |
| 166 ascii = g_malloc(len * 2 + 1); | 166 ascii = g_malloc(len * 2 + 1); |
| 167 | 167 |
| 168 for (i = 0; i < len; i++) | 168 for (i = 0; i < len; i++) |
| 169 g_snprintf(&ascii[i * 2], 3, "%02hx", data[i] & 0xFF); | 169 g_snprintf(&ascii[i * 2], 3, "%02x", data[i] & 0xFF); |
| 170 | 170 |
| 171 return ascii; | 171 return ascii; |
| 172 } | 172 } |
| 173 | 173 |
| 174 guchar * | 174 guchar * |
| 232 * The final colon will be replaced by a terminating NULL | 232 * The final colon will be replaced by a terminating NULL |
| 233 */ | 233 */ |
| 234 ascii = g_malloc(len * 3 + 1); | 234 ascii = g_malloc(len * 3 + 1); |
| 235 | 235 |
| 236 for (i = 0; i < len; i++) | 236 for (i = 0; i < len; i++) |
| 237 g_snprintf(&ascii[i * 3], 4, "%02hx:", data[i] & 0xFF); | 237 g_snprintf(&ascii[i * 3], 4, "%02x:", data[i] & 0xFF); |
| 238 | 238 |
| 239 /* Replace the final colon with NULL */ | 239 /* Replace the final colon with NULL */ |
| 240 ascii[len * 3 - 1] = 0; | 240 ascii[len * 3 - 1] = 0; |
| 241 | 241 |
| 242 return ascii; | 242 return ascii; |
| 3748 | 3748 |
| 3749 ret = g_string_sized_new(len); | 3749 ret = g_string_sized_new(len); |
| 3750 | 3750 |
| 3751 for (i = 0; i < len; i++) | 3751 for (i = 0; i < len; i++) |
| 3752 if (binary[i] < 32 || binary[i] > 126) | 3752 if (binary[i] < 32 || binary[i] > 126) |
| 3753 g_string_append_printf(ret, "\\x%02hx", binary[i] & 0xFF); | 3753 g_string_append_printf(ret, "\\x%02x", binary[i] & 0xFF); |
| 3754 else if (binary[i] == '\\') | 3754 else if (binary[i] == '\\') |
| 3755 g_string_append(ret, "\\\\"); | 3755 g_string_append(ret, "\\\\"); |
| 3756 else | 3756 else |
| 3757 g_string_append_c(ret, binary[i]); | 3757 g_string_append_c(ret, binary[i]); |
| 3758 | 3758 |
