comparison: libpurple/plugins/log_reader.c
libpurple/plugins/log_reader.c
- changeset 19080
- 37da30ac730d
- parent 19060
- d330f88b0ed6
- child 19090
- f14418fec130
equal
deleted
inserted
replaced
| 19079:b65aa2562c50 | 19080:37da30ac730d |
|---|---|
| 234 gchar *read = NULL; | 234 gchar *read = NULL; |
| 235 gsize length; | 235 gsize length; |
| 236 | 236 |
| 237 /* XXX: TODO: We probably want to set PURPLE_LOG_READ_NO_NEWLINE | 237 /* XXX: TODO: We probably want to set PURPLE_LOG_READ_NO_NEWLINE |
| 238 * XXX: TODO: for HTML logs. */ | 238 * XXX: TODO: for HTML logs. */ |
| 239 *flags = 0; | 239 if (flags != NULL) |
| 240 *flags = 0; | |
| 240 | 241 |
| 241 g_return_val_if_fail(log != NULL, g_strdup("")); | 242 g_return_val_if_fail(log != NULL, g_strdup("")); |
| 242 | 243 |
| 243 data = log->logger_data; | 244 data = log->logger_data; |
| 244 | 245 |
| 1426 char *escaped; | 1427 char *escaped; |
| 1427 GString *formatted; | 1428 GString *formatted; |
| 1428 char *c; | 1429 char *c; |
| 1429 const char *line; | 1430 const char *line; |
| 1430 | 1431 |
| 1431 *flags = PURPLE_LOG_READ_NO_NEWLINE; | 1432 if (flags != NULL) |
| 1433 *flags = PURPLE_LOG_READ_NO_NEWLINE; | |
| 1434 | |
| 1432 g_return_val_if_fail(log != NULL, g_strdup("")); | 1435 g_return_val_if_fail(log != NULL, g_strdup("")); |
| 1433 | 1436 |
| 1434 data = log->logger_data; | 1437 data = log->logger_data; |
| 1435 | 1438 |
| 1436 g_return_val_if_fail(data->path != NULL, g_strdup("")); | 1439 g_return_val_if_fail(data->path != NULL, g_strdup("")); |
| 1922 gchar *contents; | 1925 gchar *contents; |
| 1923 GError *error; | 1926 GError *error; |
| 1924 char *utf8_string; | 1927 char *utf8_string; |
| 1925 FILE *file; | 1928 FILE *file; |
| 1926 | 1929 |
| 1927 *flags = PURPLE_LOG_READ_NO_NEWLINE; | 1930 if (flags != NULL) |
| 1931 *flags = PURPLE_LOG_READ_NO_NEWLINE; | |
| 1932 | |
| 1928 g_return_val_if_fail(log != NULL, g_strdup("")); | 1933 g_return_val_if_fail(log != NULL, g_strdup("")); |
| 1929 | 1934 |
| 1930 data = log->logger_data; | 1935 data = log->logger_data; |
| 1931 | 1936 |
| 1932 g_return_val_if_fail(data->path != NULL, g_strdup("")); | 1937 g_return_val_if_fail(data->path != NULL, g_strdup("")); |
