# HG changeset patch # User Michael Shkutkov # Date 1182405941 0 # Node ID 6935c7bbd310c918e8e895ddb6179734b99c71c2 # Parent 179bb0ea89c7b92cac3d6b683f3c69f0fe1abed3 small coding style changes diff -r 179bb0ea89c7 -r 6935c7bbd310 libpurple/plugins/log_reader.c --- a/libpurple/plugins/log_reader.c Wed Jun 20 22:42:01 2007 +0000 +++ b/libpurple/plugins/log_reader.c Thu Jun 21 06:05:41 2007 +0000 @@ -1745,7 +1745,6 @@ #define QIP_LOG_OUT_MESSAGE_ESC (QIP_LOG_DELIMITER ">-") static PurpleLogLogger *qip_logger; -static void qip_logger_finalize(PurpleLog *log); struct qip_logger_data { @@ -1773,14 +1772,14 @@ g_return_val_if_fail(account != NULL, list); purple_debug(PURPLE_DEBUG_INFO, "QIP logger list", - "arguments not NULL\n"); + "arguments not NULL\n"); /* QIP is ICQ messenger. Should we add prpl-aim? */ if (strcmp(account->protocol_id, "prpl-icq")) return list; purple_debug(PURPLE_DEBUG_INFO, "QIP logger list", - "protocol is 'prpl-icq'\n"); + "protocol is 'prpl-icq'\n"); logdir = purple_prefs_get_string("/plugins/core/log_reader/qip/log_directory"); @@ -1798,20 +1797,22 @@ buddy_name = g_strdup(purple_normalize(account, sn)); purple_debug(PURPLE_DEBUG_INFO, "QIP logger list", - "buddy_name %s\n", buddy_name); + "buddy_name %s\n", buddy_name); username = g_strdup(purple_normalize(account, account->username)); purple_debug(PURPLE_DEBUG_INFO, "QIP logger list", - "username %s\n", username); - + "username %s\n", username); + purple_debug(PURPLE_DEBUG_INFO, "QIP logger list", - "sn %s\n", sn); + "sn %s\n", sn); filename = g_strdup_printf("%s.txt", buddy_name); path = g_build_filename( logdir, username, "History", filename, NULL); + purple_debug(PURPLE_DEBUG_INFO, "QIP logger list", - "Reading %s\n", path); + "Reading %s\n", path); + if (!g_file_get_contents(path, &contents, &length, &error)) if (error) g_error_free(error); @@ -1840,10 +1841,10 @@ /* Parse the time, day, month and year */ if (sscanf(timestamp, "%u:%u:%u %u/%u/%u", - &tm.tm_hour, &tm.tm_min, &tm.tm_sec, - &tm.tm_mday, &tm.tm_mon, &tm.tm_year) != 6) { - purple_debug(PURPLE_DEBUG_ERROR, "QIP logger list", - "Parsing timestamp error\n"); + &tm.tm_hour, &tm.tm_min, &tm.tm_sec, + &tm.tm_mday, &tm.tm_mon, &tm.tm_year) != 6) { + purple_debug(PURPLE_DEBUG_ERROR, "QIP logger list", + "Parsing timestamp error\n"); } else { PurpleLog *log; @@ -1856,8 +1857,8 @@ purple_debug(PURPLE_DEBUG_INFO, "QIP logger list", "Parsing timestamp: %u/%u/%u %u:%u:%u\n", - tm.tm_year, tm.tm_mon, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec); + tm.tm_year, tm.tm_mon, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec); /* Let the C library deal with * daylight savings time. @@ -1943,7 +1944,7 @@ is_in_message = purple_str_has_prefix(line, QIP_LOG_IN_MESSAGE_ESC); purple_debug(PURPLE_DEBUG_INFO, "QIP loggger read", - "%s message\n", (is_in_message) ? "incoming" : "Outgoing"); + "%s message\n", (is_in_message) ? "incoming" : "Outgoing"); /* find EOL */ c = strstr(c, "\n"); @@ -1966,14 +1967,14 @@ /* Parse the time, day, month and year */ if (sscanf(timestamp, "%u:%u:%u", - &hour, &min, &sec) != 3) + &hour, &min, &sec) != 3) purple_debug(PURPLE_DEBUG_ERROR, "QIP logger read", - "Parsing timestamp error\n"); + "Parsing timestamp error\n"); else { g_string_append(formatted, ""); g_string_append_printf(formatted, - "(%u:%02u:%02u) %cM ", hour % 12, - min, sec, (hour >= 12) ? 'P': 'A'); + "(%u:%02u:%02u) %cM ", hour % 12, + min, sec, (hour >= 12) ? 'P': 'A'); g_string_append(formatted, " "); if (is_in_message) {