# HG changeset patch # User Mikael Berthe # Date 1123193094 -3600 # Node ID f8f3c74934570632b243320dcbcb0b351d048f04 # Parent 6329c9601704d7557e0e7a2801f55880603a5e6c Whitespace cleanup diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/commands.c --- a/mcabber/src/commands.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/commands.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * commands.c -- user commands handling - * + * * Copyright (C) 2005 Mikael Berthe * * This program is free software; you can redistribute it and/or modify @@ -214,7 +214,7 @@ void send_message(const char *msg) { const char *jid; - + if (!current_buddy) { scr_LogPrint(LPRINT_NORMAL, "No buddy currently selected."); return; @@ -731,7 +731,7 @@ { guint assign; const gchar *option, *value; - + assign = parse_assigment(arg, &option, &value); if (!option) { scr_LogPrint(LPRINT_NORMAL, "Huh?"); @@ -761,7 +761,7 @@ { guint assign; const gchar *alias, *value; - + assign = parse_assigment(arg, &alias, &value); if (!alias) { scr_LogPrint(LPRINT_NORMAL, "Huh?"); @@ -800,7 +800,7 @@ { guint assign; const gchar *keycode, *value; - + assign = parse_assigment(arg, &keycode, &value); if (!keycode) { scr_LogPrint(LPRINT_NORMAL, "Huh?"); diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/compl.c --- a/mcabber/src/compl.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/compl.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * compl.c -- Completion system - * + * * Copyright (C) 2005 Mikael Berthe * * This program is free software; you can redistribute it and/or modify diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/hbuf.c --- a/mcabber/src/hbuf.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/hbuf.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * hbuf.c -- History buffer implementation - * + * * Copyright (C) 2005 Mikael Berthe * * This program is free software; you can redistribute it and/or modify @@ -182,7 +182,7 @@ hbuf_b_curr->ptr_end = hbuf_b_next->ptr_end; g_free(hbuf_b_next); g_list_delete_link(curr_elt, next_elt); - } else + } else curr_elt = next_elt; } // #2 Go back to head and create non-persistent blocks when needed diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/hooks.c --- a/mcabber/src/hooks.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/hooks.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * hooks.c -- Hooks layer - * + * * Copyright (C) 2005 Mikael Berthe * * This program is free software; you can redistribute it and/or modify @@ -75,7 +75,7 @@ hk_ext_cmd(jid, 'M', 'S', NULL); } -inline void hk_statuschange(const char *jid, time_t timestamp, +inline void hk_statuschange(const char *jid, time_t timestamp, enum imstatus status, const char *status_msg) { scr_LogPrint(LPRINT_LOGNORM, "Buddy status has changed: [%c>%c] <%s> %s", diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/hooks.h --- a/mcabber/src/hooks.h Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/hooks.h Thu Aug 04 23:04:54 2005 +0100 @@ -8,7 +8,7 @@ inline void hk_message_in(const char *jid, time_t timestamp, const char *msg, const char *type); inline void hk_message_out(const char *jid, time_t timestamp, const char *msg); -inline void hk_statuschange(const char *jid, time_t timestamp, +inline void hk_statuschange(const char *jid, time_t timestamp, enum imstatus status, char const *status_msg); inline void hk_mystatuschange(time_t timestamp, enum imstatus old_status, enum imstatus new_status, const char *msg); diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/jabglue.c --- a/mcabber/src/jabglue.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/jabglue.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * jabglue.c -- Jabber protocol handling - * + * * Copyright (C) 2005 Mikael Berthe * Parts come from the centericq project: * Copyright (C) 2002-2005 by Konstantin Klyagin @@ -111,8 +111,8 @@ char *compose_jid(const char *username, const char *servername, const char *resource) { - char *jid = g_new(char, - strlen(username)+strlen(servername)+strlen(resource)+3); + char *jid = g_new(char, 3 + + strlen(username) + strlen(servername) + strlen(resource)); strcpy(jid, username); strcat(jid, "@"); strcat(jid, servername); diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/list.h --- a/mcabber/src/list.h Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/list.h Thu Aug 04 23:04:54 2005 +0100 @@ -25,7 +25,7 @@ } while (0) /* - * Insert a new entry between two known consecutive entries. + * Insert a new entry between two known consecutive entries. * * This is only for internal list manipulation where we know * the prev/next entries already! diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/main.c --- a/mcabber/src/main.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/main.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * main.c - * + * * Copyright (C) 2005 Mikael Berthe * Parts of this file come from Cabber * diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/roster.c --- a/mcabber/src/roster.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/roster.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * roster.c -- Local roster implementation - * + * * Copyright (C) 2005 Mikael Berthe * * This program is free software; you can redistribute it and/or modify @@ -539,7 +539,7 @@ // Remove the buddy from current group sl_group = &((roster*)((GSList*)roster_usr->list)->data)->list; *sl_group = g_slist_remove(*sl_group, rosterdata); - + // Add the buddy to its new group; actually we "clone" this buddy... sl_clone = roster_add_user(roster_usr->jid, roster_usr->name, newgroupname, roster_usr->type); diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/screen.c --- a/mcabber/src/screen.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/screen.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * screen.c -- UI stuff - * + * * Copyright (C) 2005 Mikael Berthe * Parts of this file come from the Cabber project * @@ -277,7 +277,7 @@ int lines; int cols; window_entry_t *tmp; - + do { tmp = calloc(1, sizeof(window_entry_t)); } while (!tmp); diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/settings.c --- a/mcabber/src/settings.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/settings.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * settings.c -- Configuration stuff - * + * * Copyright (C) 2005 Mikael Berthe * * This program is free software; you can redistribute it and/or modify @@ -50,7 +50,7 @@ static GSList *settings_find(GSList *list, const gchar *key) { GSList *ptr; - + if (!list) return NULL; for (ptr = list ; ptr; ptr = g_slist_next(ptr)) diff -r 6329c9601704 -r f8f3c7493457 mcabber/src/utils.c --- a/mcabber/src/utils.c Thu Aug 04 22:55:10 2005 +0100 +++ b/mcabber/src/utils.c Thu Aug 04 23:04:54 2005 +0100 @@ -1,6 +1,6 @@ /* * utils.c -- Various utility functions - * + * * Copyright (C) 2005 Mikael Berthe * ut_* functions are derived from Cabber debug/log code. * from_iso8601() comes from the Gaim project. @@ -76,7 +76,7 @@ void ut_WriteLog(unsigned int flag, const char *data) { if (!DebugEnabled || !FName) return; - + if (((DebugEnabled == 2) && (flag & (LPRINT_LOG|LPRINT_DEBUG))) || ((DebugEnabled == 1) && (flag & LPRINT_LOG))) { FILE *fp = fopen(FName, "a+");