[ekg2-commit] r4073 - trunk/ekg: trunk/ekg/commands.c trunk/ekg/dynstuff_inline.h trunk/ekg/emoticons.c trunk/ekg/events.c trunk/ekg/log.c trunk/ekg/metacontacts.c trunk/ekg/plugins.c trunk/ekg/sessions.c trunk/ekg/stuff.c trunk/ekg/themes.c trunk/ekg/userlist.c trunk/ekg/vars.c trunk/ekg/windows.c
SVN commit
svn w toxygen.net
Śro, 9 Lip 2008, 11:40:31 CEST
Author: darkjames
Date: 2008-07-09 11:40:30 +0200 (Wed, 09 Jul 2008)
New Revision: 4073
Modified:
trunk/ekg/commands.c
trunk/ekg/dynstuff_inline.h
trunk/ekg/emoticons.c
trunk/ekg/events.c
trunk/ekg/log.c
trunk/ekg/metacontacts.c
trunk/ekg/plugins.c
trunk/ekg/sessions.c
trunk/ekg/stuff.c
trunk/ekg/themes.c
trunk/ekg/userlist.c
trunk/ekg/vars.c
trunk/ekg/windows.c
Log:
Modified: trunk/ekg/commands.c
===================================================================
--- trunk/ekg/commands.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/commands.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -114,10 +114,11 @@
static LIST_ADD_COMPARE(command_add_compare, command_t *) { return xstrcasecmp(data1->name, data2->name); }
static LIST_FREE_ITEM(list_command_free, command_t *) { array_free(data->params); array_free(data->possibilities); }
-__DYNSTUFF_LIST_ADD_SORTED(commands, command_t, command_add_compare); /* commands_add() */
-__DYNSTUFF_LIST_REMOVE_SAFE(commands, command_t, list_command_free); /* commands_remove() */
-__DYNSTUFF_LIST_REMOVE_ITER(commands, command_t, list_command_free); /* commands_removei() */
-__DYNSTUFF_LIST_DESTROY(commands, command_t, list_command_free); /* commands_destroy() */
+DYNSTUFF_LIST_DECLARE2_SORTED(commands, command_t, command_add_compare, list_command_free,
+ static __DYNSTUFF_LIST_ADD_SORTED, /* commands_add() */
+ __DYNSTUFF_LIST_REMOVE_SAFE, /* commands_remove() */
+ __DYNSTUFF_LIST_REMOVE_ITER, /* commands_removei() */
+ __DYNSTUFF_LIST_DESTROY) /* commands_destroy() */
/*
* match_arg()
Modified: trunk/ekg/dynstuff_inline.h
===================================================================
--- trunk/ekg/dynstuff_inline.h 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/dynstuff_inline.h 2008-07-09 09:40:30 UTC (rev 4073)
@@ -385,18 +385,21 @@
list_destroy(lista, type, free_func) \
list_count(lista, type)
+#define DYNSTUFF_LIST_DECLARE(lista, type, free_func, list_add, list_remove, list_destroy) \
+ DYNSTUFF_LIST_DECLARE_WC(lista, type, free_func, list_add, list_remove, list_destroy, __DYNSTUFF_NOCOUNT)
+
#define DYNSTUFF_LIST_DECLARE_WC(lista, type, free_func, list_add, list_remove, list_destroy, list_count) \
DYNSTUFF_LIST_DECLARE_FULL(lista, type, NULL, free_func, list_add, list_remove, __DYNSTUFF_NOREMOVE, __DYNSTUFF_NOUNLINK, list_destroy, list_count)
-#define DYNSTUFF_LIST_DECLARE(lista, type, free_func, list_add, list_remove, list_destroy) \
- DYNSTUFF_LIST_DECLARE_WC(lista, type, free_func, list_add, list_remove, list_destroy, __DYNSTUFF_NOCOUNT)
-
#define DYNSTUFF_LIST_DECLARE2(lista, type, free_func, list_add, list_remove, list_remove2, list_destroy) \
DYNSTUFF_LIST_DECLARE_FULL(lista, type, NULL, free_func, list_add, list_remove, list_remove2, __DYNSTUFF_NOUNLINK, list_destroy, __DYNSTUFF_NOCOUNT)
#define DYNSTUFF_LIST_DECLARE_SORTED(lista, type, compare_func, free_func, list_add, list_remove, list_destroy) \
DYNSTUFF_LIST_DECLARE_FULL(lista, type, compare_func, free_func, list_add, list_remove, __DYNSTUFF_NOREMOVE, __DYNSTUFF_NOUNLINK, list_destroy, __DYNSTUFF_NOCOUNT)
+#define DYNSTUFF_LIST_DECLARE2_SORTED(lista, type, compare_func, free_func, list_add, list_remove, list_remove2, list_destroy) \
+ DYNSTUFF_LIST_DECLARE_FULL(lista, type, compare_func, free_func, list_add, list_remove, list_remove2, __DYNSTUFF_NOUNLINK, list_destroy, __DYNSTUFF_NOCOUNT)
+
#define DYNSTUFF_LIST_DECLARE_SORTED_NF(lista, type, compare_func, list_add, list_unlink) \
DYNSTUFF_LIST_DECLARE_FULL(lista, type, compare_func, NULL, list_add, __DYNSTUFF_NOREMOVE, __DYNSTUFF_NOREMOVE, list_unlink, __DYNSTUFF_NODESTROY, __DYNSTUFF_NOCOUNT)
Modified: trunk/ekg/emoticons.c
===================================================================
--- trunk/ekg/emoticons.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/emoticons.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -43,9 +43,9 @@
static LIST_FREE_ITEM(list_emoticon_free, emoticon_t *) { xfree(data->name); xfree(data->value); }
DYNSTUFF_LIST_DECLARE(emoticons, emoticon_t, list_emoticon_free,
- __DYNSTUFF_LIST_ADD, /* emoticons_add() */
+ static __DYNSTUFF_LIST_ADD, /* emoticons_add() */
__DYNSTUFF_NOREMOVE,
- __DYNSTUFF_LIST_DESTROY) /* emoticons_destroy() */
+ __DYNSTUFF_LIST_DESTROY) /* emoticons_destroy() */
int config_emoticons = 1;
Modified: trunk/ekg/events.c
===================================================================
--- trunk/ekg/events.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/events.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -46,9 +46,9 @@
static LIST_FREE_ITEM(list_event_free, struct event *) { xfree(data->name); xfree(data->action); xfree(data->target); }
DYNSTUFF_LIST_DECLARE_SORTED(events, event_t, event_add_compare, list_event_free,
- __DYNSTUFF_LIST_ADD_SORTED, /* events_add() */
- __DYNSTUFF_LIST_REMOVE_SAFE, /* events_remove() */
- __DYNSTUFF_LIST_DESTROY) /* events_destroy() */
+ static __DYNSTUFF_LIST_ADD_SORTED, /* events_add() */
+ static __DYNSTUFF_LIST_REMOVE_SAFE, /* events_remove() */
+ static __DYNSTUFF_LIST_DESTROY) /* events_destroy() */
char **events_all = NULL;
Modified: trunk/ekg/log.c
===================================================================
--- trunk/ekg/log.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/log.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -36,16 +36,13 @@
int config_last_size = 10;
int config_last = 0;
-static LIST_FREE_ITEM(list_last_free, struct last *) {
- xfree(data->uid);
- xfree(data->message);
-}
+static LIST_FREE_ITEM(list_last_free, struct last *) { xfree(data->uid); xfree(data->message); }
DYNSTUFF_LIST_DECLARE_WC(lasts, struct last, list_last_free,
- __DYNSTUFF_LIST_ADD, /* lasts_add() */
- __DYNSTUFF_LIST_REMOVE_ITER, /* lasts_removei() */
- __DYNSTUFF_LIST_DESTROY, /* lasts_destroy() */
- __DYNSTUFF_LIST_COUNT) /* lasts_count() */
+ static __DYNSTUFF_LIST_ADD, /* lasts_add() */
+ static __DYNSTUFF_LIST_REMOVE_ITER, /* lasts_removei() */
+ __DYNSTUFF_LIST_DESTROY, /* lasts_destroy() */
+ static __DYNSTUFF_LIST_COUNT) /* lasts_count() */
/*
* last_add()
Modified: trunk/ekg/metacontacts.c
===================================================================
--- trunk/ekg/metacontacts.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/metacontacts.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -49,18 +49,18 @@
static LIST_FREE_ITEM(metacontact_item_free, metacontact_item_t *) { xfree(data->name); xfree(data->s_uid); }
DYNSTUFF_LIST_DECLARE_SORTED(metacontact_items, metacontact_item_t, metacontact_add_item_compare, metacontact_item_free,
- __DYNSTUFF_ADD_SORTED, /* metacontact_items_add() */
- __DYNSTUFF_REMOVE_SAFE, /* metacontact_items_remove() */ /* maybe removei() ? */
- __DYNSTUFF_DESTROY) /* metacontact_items_destroy() */
+ static __DYNSTUFF_ADD_SORTED, /* metacontact_items_add() */
+ static __DYNSTUFF_REMOVE_SAFE, /* metacontact_items_remove() */ /* maybe removei() ? */
+ static __DYNSTUFF_DESTROY) /* metacontact_items_destroy() */
/* metacontacts: */
static LIST_ADD_COMPARE(metacontact_add_compare, metacontact_t *) { return xstrcasecmp(data1->name, data2->name); }
static LIST_FREE_ITEM(metacontact_list_free, metacontact_t *) { metacontact_items_destroy(&(data->metacontact_items)); xfree(data->name); }
DYNSTUFF_LIST_DECLARE_SORTED(metacontacts, metacontact_t, metacontact_add_compare, metacontact_list_free,
- __DYNSTUFF_LIST_ADD_SORTED, /* metacontacts_add() */
- __DYNSTUFF_LIST_REMOVE_SAFE, /* metacontacts_remove() */ /* maybe removei() ? */
- __DYNSTUFF_LIST_DESTROY) /* metacontacts_destroy() */
+ static __DYNSTUFF_LIST_ADD_SORTED, /* metacontacts_add() */
+ static __DYNSTUFF_LIST_REMOVE_SAFE, /* metacontacts_remove() */ /* maybe removei() ? */
+ __DYNSTUFF_LIST_DESTROY) /* metacontacts_destroy() */
static int metacontact_add_item(metacontact_t *m, const char *session, const char *name, unsigned int prio, int quiet);
static int metacontact_remove_item(metacontact_t *m, const char *session, const char *name, int quiet);
Modified: trunk/ekg/plugins.c
===================================================================
--- trunk/ekg/plugins.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/plugins.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -56,8 +56,8 @@
static LIST_ADD_COMPARE(plugin_register_compare, plugin_t *) { return data2->prio - data1->prio; }
DYNSTUFF_LIST_DECLARE_SORTED_NF(plugins, plugin_t, plugin_register_compare,
- __DYNSTUFF_LIST_ADD_SORTED, /* plugins_add() */
- __DYNSTUFF_LIST_UNLINK) /* plugins_unlink() */
+ static __DYNSTUFF_LIST_ADD_SORTED, /* plugins_add() */
+ __DYNSTUFF_LIST_UNLINK) /* plugins_unlink() */
watch_t *watches = NULL;
__DYNSTUFF_LIST_ADD_BEGINNING(watches, watch_t, NULL); /* watches_add() */
Modified: trunk/ekg/sessions.c
===================================================================
--- trunk/ekg/sessions.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/sessions.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -54,13 +54,13 @@
static LIST_ADD_COMPARE(session_compare, session_t *) { return xstrcasecmp(data1->uid, data2->uid); }
-__DYNSTUFF_LIST_ADD_SORTED(sessions, session_t, session_compare); /* sessions_add() */
-__DYNSTUFF_LIST_COUNT(sessions, session_t); /* sessions_count() */
+static __DYNSTUFF_LIST_ADD_SORTED(sessions, session_t, session_compare); /* sessions_add() */
+static __DYNSTUFF_LIST_COUNT(sessions, session_t); /* sessions_count() */
static LIST_FREE_ITEM(session_param_free_item, session_param_t *) { xfree(data->key); xfree(data->value); }
-__DYNSTUFF_ADD_BEGINNING(session_vars, session_param_t, NULL); /* session_vars_add() */
-__DYNSTUFF_DESTROY(session_vars, session_param_t, session_param_free_item); /* session_vars_destroy() */
+static __DYNSTUFF_ADD_BEGINNING(session_vars, session_param_t, NULL); /* session_vars_add() */
+static __DYNSTUFF_DESTROY(session_vars, session_param_t, session_param_free_item); /* session_vars_destroy() */
session_t *session_current = NULL;
@@ -233,8 +233,8 @@
userlist_free(data);
}
-__DYNSTUFF_LIST_REMOVE_SAFE(sessions, session_t, session_free_item); /* sessions_remove() */
-__DYNSTUFF_LIST_DESTROY(sessions, session_t, session_free_item); /* sessions_destroy() */
+static __DYNSTUFF_LIST_REMOVE_SAFE(sessions, session_t, session_free_item); /* sessions_remove() */
+static __DYNSTUFF_LIST_DESTROY(sessions, session_t, session_free_item); /* sessions_destroy() */
/**
* session_remove()
Modified: trunk/ekg/stuff.c
===================================================================
--- trunk/ekg/stuff.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/stuff.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -88,9 +88,9 @@
static LIST_FREE_ITEM(child_free_item, child_t *) { xfree(data->name); }
DYNSTUFF_LIST_DECLARE(children, child_t, child_free_item,
- __DYNSTUFF_LIST_ADD, /* children_add() */
- __DYNSTUFF_LIST_REMOVE_ITER, /* children_removei() */
- __DYNSTUFF_LIST_DESTROY) /* children_destroy() */
+ static __DYNSTUFF_LIST_ADD, /* children_add() */
+ __DYNSTUFF_LIST_REMOVE_ITER, /* children_removei() */
+ __DYNSTUFF_LIST_DESTROY) /* children_destroy() */
alias_t *aliases = NULL;
list_t autofinds = NULL;
@@ -101,10 +101,10 @@
DYNSTUFF_LIST_DECLARE2(timers, struct timer, timer_free_item,
- __DYNSTUFF_LIST_ADD, /* timers_add() */
- __DYNSTUFF_LIST_REMOVE_SAFE, /* timers_remove() */
- __DYNSTUFF_LIST_REMOVE_ITER, /* timers_removei() */
- __DYNSTUFF_LIST_DESTROY) /* timers_destroy() */
+ static __DYNSTUFF_LIST_ADD, /* timers_add() */
+ __DYNSTUFF_LIST_REMOVE_SAFE, /* timers_remove() */
+ __DYNSTUFF_LIST_REMOVE_ITER, /* timers_removei() */
+ __DYNSTUFF_LIST_DESTROY) /* timers_destroy() */
struct conference *conferences = NULL;
newconference_t *newconferences = NULL;
@@ -259,9 +259,9 @@
static LIST_FREE_ITEM(list_alias_free, alias_t *) { xfree(data->name); LIST_DESTROY2(data->commands, list_t_free_item); }
DYNSTUFF_LIST_DECLARE(aliases, alias_t, list_alias_free,
- __DYNSTUFF_LIST_ADD, /* aliases_add() */
- __DYNSTUFF_LIST_REMOVE_ITER, /* aliases_removei() */
- __DYNSTUFF_LIST_DESTROY) /* aliases_destroy() */
+ static __DYNSTUFF_LIST_ADD, /* aliases_add() */
+ static __DYNSTUFF_LIST_REMOVE_ITER, /* aliases_removei() */
+ __DYNSTUFF_LIST_DESTROY) /* aliases_destroy() */
/*
* alias_add()
@@ -424,8 +424,8 @@
xfree(data->sequence);
}
-__DYNSTUFF_LIST_DESTROY(bindings, struct binding, binding_free_item); /* bindings_destroy() */
-__DYNSTUFF_LIST_DESTROY(bindings_added, binding_added_t, binding_added_free_item); /* bindings_added_destroy() */
+static __DYNSTUFF_LIST_DESTROY(bindings, struct binding, binding_free_item); /* bindings_destroy() */
+static __DYNSTUFF_LIST_DESTROY(bindings_added, binding_added_t, binding_added_free_item); /* bindings_added_destroy() */
/**
* binding_free()
@@ -687,9 +687,9 @@
static LIST_FREE_ITEM(newconference_free_item, newconference_t *) { xfree(data->name); xfree(data->session); userlists_destroy(&(data->participants)); }
DYNSTUFF_LIST_DECLARE(newconferences, newconference_t, newconference_free_item,
- __DYNSTUFF_LIST_ADD, /* newconferences_add() */
- __DYNSTUFF_LIST_REMOVE_SAFE, /* newconferences_remove() */
- __DYNSTUFF_LIST_DESTROY) /* newconferences_destroy() */
+ static __DYNSTUFF_LIST_ADD, /* newconferences_add() */
+ static __DYNSTUFF_LIST_REMOVE_SAFE, /* newconferences_remove() */
+ __DYNSTUFF_LIST_DESTROY) /* newconferences_destroy() */
userlist_t *newconference_member_find(newconference_t *conf, const char *uid) {
userlist_t *ul;
@@ -762,9 +762,9 @@
static LIST_FREE_ITEM(conference_free_item, struct conference *) { xfree(data->name); LIST_DESTROY2(data->recipients, list_t_free_item); }
DYNSTUFF_LIST_DECLARE(conferences, struct conference, conference_free_item,
- __DYNSTUFF_LIST_ADD, /* conferences_add() */
- __DYNSTUFF_LIST_REMOVE_ITER, /* conferences_removei() */
- __DYNSTUFF_LIST_DESTROY) /* conferences_destroy() */
+ static __DYNSTUFF_LIST_ADD, /* conferences_add() */
+ static __DYNSTUFF_LIST_REMOVE_ITER, /* conferences_removei() */
+ __DYNSTUFF_LIST_DESTROY) /* conferences_destroy() */
/*
* conference_add()
Modified: trunk/ekg/themes.c
===================================================================
--- trunk/ekg/themes.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/themes.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -62,9 +62,9 @@
}
DYNSTUFF_LIST_DECLARE(formats, struct format, list_format_free,
- __DYNSTUFF_ADD_BEGINNING, /* formats_add() */
- __DYNSTUFF_REMOVE_ITER, /* formats_removei() */
- __DYNSTUFF_DESTROY) /* formats_destroy() */
+ static __DYNSTUFF_ADD_BEGINNING, /* formats_add() */
+ static __DYNSTUFF_REMOVE_ITER, /* formats_removei() */
+ static __DYNSTUFF_DESTROY) /* formats_destroy() */
/**
* gim_hash()
Modified: trunk/ekg/userlist.c
===================================================================
--- trunk/ekg/userlist.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/userlist.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -78,17 +78,16 @@
/* userlist: */
static LIST_ADD_COMPARE(userlist_compare, userlist_t *) { return xstrcasecmp(data1->nickname, data2->nickname); }
-__DYNSTUFF_ADD_SORTED(userlists, userlist_t, userlist_compare); /* userlists_add() */
+static __DYNSTUFF_ADD_SORTED(userlists, userlist_t, userlist_compare); /* userlists_add() */
-
/* groups: */
static LIST_ADD_COMPARE(group_compare, struct ekg_group *) { return xstrcasecmp(data1->name, data2->name); }
static LIST_FREE_ITEM(group_item_free, struct ekg_group *) { xfree(data->name); }
DYNSTUFF_LIST_DECLARE_SORTED(ekg_groups, struct ekg_group, group_compare, group_item_free,
- __DYNSTUFF_ADD_SORTED, /* ekg_groups_add() */
- __DYNSTUFF_REMOVE_ITER, /* ekg_groups_removei() */
- __DYNSTUFF_DESTROY) /* ekg_groups_destroy() */
+ static __DYNSTUFF_ADD_SORTED, /* ekg_groups_add() */
+ static __DYNSTUFF_REMOVE_ITER, /* ekg_groups_removei() */
+ static __DYNSTUFF_DESTROY) /* ekg_groups_destroy() */
/* resources: */
static LIST_ADD_COMPARE(userlist_resource_compare, ekg_resource_t *) {
@@ -101,9 +100,9 @@
static LIST_FREE_ITEM(list_userlist_resource_free, ekg_resource_t *) { xfree(data->name); xfree(data->descr); }
DYNSTUFF_LIST_DECLARE_SORTED(ekg_resources, ekg_resource_t, userlist_resource_compare, list_userlist_resource_free,
- __DYNSTUFF_ADD_SORTED, /* ekg_resources_add() */
- __DYNSTUFF_REMOVE_SAFE, /* ekg_resources_remove() */
- __DYNSTUFF_DESTROY) /* ekg_resources_destroy() */
+ static __DYNSTUFF_ADD_SORTED, /* ekg_resources_add() */
+ static __DYNSTUFF_REMOVE_SAFE, /* ekg_resources_remove() */
+ static __DYNSTUFF_DESTROY) /* ekg_resources_destroy() */
/*
* userlist_add_entry()
Modified: trunk/ekg/vars.c
===================================================================
--- trunk/ekg/vars.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/vars.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -48,7 +48,7 @@
char *console_charset;
static LIST_ADD_COMPARE(variable_add_compare, variable_t *) { return xstrcasecmp(data1->name, data2->name); }
-__DYNSTUFF_LIST_ADD_SORTED(variables, variable_t, variable_add_compare); /* variables_add() */
+static __DYNSTUFF_LIST_ADD_SORTED(variables, variable_t, variable_add_compare); /* variables_add() */
variable_t *variables = NULL;
Modified: trunk/ekg/windows.c
===================================================================
--- trunk/ekg/windows.c 2008-07-08 21:20:34 UTC (rev 4072)
+++ trunk/ekg/windows.c 2008-07-09 09:40:30 UTC (rev 4073)
@@ -51,9 +51,9 @@
static LIST_ADD_COMPARE(window_new_compare, window_t *) { return data1->id - data2->id; }
static LIST_FREE_ITEM(list_window_free, window_t *) { xfree(data->target); userlists_destroy(&(data->userlist)); }
-__DYNSTUFF_LIST_ADD_SORTED(windows, window_t, window_new_compare); /* windows_add() */
-__DYNSTUFF_LIST_UNLINK(windows, window_t); /* windows_unlink() */
-__DYNSTUFF_LIST_REMOVE_SAFE(windows, window_t, list_window_free); /* windows_remove() */
+static __DYNSTUFF_LIST_ADD_SORTED(windows, window_t, window_new_compare); /* windows_add() */
+static __DYNSTUFF_LIST_UNLINK(windows, window_t); /* windows_unlink() */
+static __DYNSTUFF_LIST_REMOVE_SAFE(windows, window_t, list_window_free); /* windows_remove() */
__DYNSTUFF_LIST_DESTROY(windows, window_t, list_window_free); /* windows_destroy() */
int config_display_crap = 1; /* czy wyświetlać śmieci? */
Więcej informacji o liście dyskusyjnej ekg2-commit