author | Myhailo Danylenko <isbear@ukrpost.net> |
Wed, 15 May 2013 13:32:42 +0300 | |
changeset 86 | ac5fed257211 |
parent 85 | 93c3cc0d7891 |
child 87 | 78238d26911a |
permissions | -rw-r--r-- |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
1 |
# HG changeset patch |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
2 |
# Parent eea31b4da8d02b5e9aaaab062848273610f9d0dd |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
3 |
[work-in-progress] Use glib slices to allocate constant-size blocks |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
4 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
5 |
diff -r eea31b4da8d0 mcabber/mcabber/caps.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
6 |
--- a/mcabber/mcabber/caps.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
7 |
+++ b/mcabber/mcabber/caps.c Wed May 15 12:57:17 2013 +0300 |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
8 |
@@ -52,7 +52,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
9 |
g_hash_table_destroy(c->identities); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
10 |
g_hash_table_destroy(c->features); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
11 |
g_hash_table_destroy(c->forms); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
12 |
- g_free(c); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
13 |
+ g_slice_free(caps, c); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
14 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
15 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
16 |
void identity_destroy(gpointer data) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
17 |
@@ -61,14 +61,14 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
18 |
g_free(i->category); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
19 |
g_free(i->type); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
20 |
g_free(i->name); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
21 |
- g_free(i); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
22 |
+ g_slice_free(identity, i); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
23 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
24 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
25 |
void form_destroy(gpointer data) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
26 |
{ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
27 |
dataform *f = data; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
28 |
g_hash_table_destroy(f->fields); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
29 |
- g_free(f); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
30 |
+ g_slice_free(dataform, f); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
31 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
32 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
33 |
void field_destroy(gpointer data) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
34 |
@@ -97,7 +97,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
35 |
{ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
36 |
if (!hash) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
37 |
return; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
38 |
- caps *c = g_new0(caps, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
39 |
+ caps *c = g_slice_new(caps); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
40 |
c->features = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
41 |
c->identities = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, identity_destroy); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
42 |
c->forms = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, form_destroy); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
43 |
@@ -158,7 +158,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
44 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
45 |
c = g_hash_table_lookup(caps_cache, hash); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
46 |
if (c) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
47 |
- identity *i = g_new0(identity, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
48 |
+ identity *i = g_slice_new(identity); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
49 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
50 |
i->category = g_strdup(category); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
51 |
i->name = g_strdup(name); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
52 |
@@ -182,7 +182,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
53 |
return; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
54 |
c = g_hash_table_lookup(caps_cache, hash); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
55 |
if (c) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
56 |
- dataform *d = g_new0(dataform, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
57 |
+ dataform *d = g_slice_new(dataform); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
58 |
char *f = g_strdup(formtype); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
59 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
60 |
d->fields = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, field_destroy); |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
61 |
diff -r eea31b4da8d0 mcabber/mcabber/commands.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
62 |
--- a/mcabber/mcabber/commands.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
63 |
+++ b/mcabber/mcabber/commands.c Wed May 15 12:57:17 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
64 |
@@ -115,7 +115,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
65 |
gpointer userdata = command->userdata; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
66 |
Commands = g_slist_delete_link(Commands, sl_cmd); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
67 |
compl_del_category_word(COMPL_CMD, command->name); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
68 |
- g_free(command); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
69 |
+ g_slice_free(cmd, command); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
70 |
return userdata; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
71 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
72 |
return NULL; |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
73 |
@@ -127,7 +127,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
74 |
gpointer cmd_add(const char *name, const char *help, guint flags_row1, |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
75 |
guint flags_row2, void (*f)(char*), gpointer userdata) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
76 |
{ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
77 |
- cmd *n_cmd = g_new0(cmd, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
78 |
+ cmd *n_cmd = g_slice_new0(cmd); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
79 |
strncpy(n_cmd->name, name, 32-1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
80 |
n_cmd->help = help; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
81 |
n_cmd->completion_flags[0] = flags_row1; |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
82 |
@@ -1581,7 +1581,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
83 |
return NULL; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
84 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
85 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
86 |
- msgbuf = g_new0(char, HBB_BLOCKSIZE); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
87 |
+ msgbuf = g_slice_alloc0(HBB_BLOCKSIZE); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
88 |
len = fread(msgbuf, 1, HBB_BLOCKSIZE-1, fd); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
89 |
fclose(fd); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
90 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
91 |
@@ -1605,7 +1605,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
92 |
if (*p || (size_t)(p-msgbuf) != len) { // We're not at the End Of Line... |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
93 |
scr_LogPrint(LPRINT_LOGNORM, "Message file contains " |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
94 |
"invalid characters (%s)", filename); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
95 |
- g_free(msgbuf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
96 |
+ g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
97 |
return NULL; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
98 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
99 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
100 |
@@ -1619,7 +1619,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
101 |
// It could be empty, once the trailing newlines are gone |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
102 |
if (p == msgbuf && *p == '\n') { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
103 |
scr_LogPrint(LPRINT_LOGNORM, "Message file is empty (%s)", filename); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
104 |
- g_free(msgbuf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
105 |
+ g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
106 |
return NULL; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
107 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
108 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
109 |
@@ -1628,7 +1628,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
110 |
if (!msgbuf_utf8 && msgbuf) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
111 |
scr_LogPrint(LPRINT_LOGNORM, "Message file charset conversion error (%s)", |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
112 |
filename); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
113 |
- g_free(msgbuf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
114 |
+ g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
115 |
return msgbuf_utf8; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
116 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
117 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
118 |
@@ -1916,7 +1916,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
119 |
esub = buddy_getsubscription(bud); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
120 |
on_srv = buddy_getonserverflag(bud); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
121 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
122 |
- buffer = g_new(char, 4096); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
123 |
+ buffer = g_slice_alloc(4096); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
124 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
125 |
if (bjid) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
126 |
GSList *resources, *p_res; |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
127 |
@@ -2015,7 +2015,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
128 |
type == ROSTER_TYPE_GROUP ? "group" : |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
129 |
(type == ROSTER_TYPE_SPECIAL ? "special" : "unknown")); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
130 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
131 |
- g_free(buffer); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
132 |
+ g_slice_free1(4096, buffer); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
133 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
134 |
// Tell the user if this item has an annotation. |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
135 |
if (type == ROSTER_TYPE_USER || |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
136 |
@@ -2063,7 +2063,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
137 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
138 |
bjid = buddy_getjid(bud); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
139 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
140 |
- buffer = g_new(char, 4096); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
141 |
+ buffer = g_slice_alloc(4096); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
142 |
strncpy(buffer, "Room members:", 127); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
143 |
scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
144 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
145 |
@@ -2118,7 +2118,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
146 |
g_free(p_res->data); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
147 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
148 |
g_slist_free(resources); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
149 |
- g_free(buffer); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
150 |
+ g_slice_free1(4096, buffer); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
151 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
152 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
153 |
static void move_group_member(gpointer bud, void *groupnamedata) |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
154 |
@@ -3110,7 +3110,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
155 |
affil = buddy_getaffil(bud, nick); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
156 |
realjid = buddy_getrjid(bud, nick); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
157 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
158 |
- buffer = g_new(char, 4096); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
159 |
+ buffer = g_slice_alloc(4096); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
160 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
161 |
snprintf(buffer, 4095, "Whois [%s]", nick); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
162 |
scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag, 0); |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
163 |
@@ -3140,7 +3140,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
164 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
165 |
scr_WriteIncomingMessage(bjid, "End of WHOIS", 0, msg_flag, 0); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
166 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
167 |
- g_free(buffer); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
168 |
+ g_slice_free1(4096, buffer); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
169 |
g_free(nick); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
170 |
if (paramlst) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
171 |
free_arg_lst(paramlst); |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
172 |
diff -r eea31b4da8d0 mcabber/mcabber/events.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
173 |
--- a/mcabber/mcabber/events.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
174 |
+++ b/mcabber/mcabber/events.c Wed May 15 12:57:17 2013 +0300 |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
175 |
@@ -83,7 +83,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
176 |
return NULL; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
177 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
178 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
179 |
- event = g_new(evs_t, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
180 |
+ event = g_slice_new(evs_t); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
181 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
182 |
event->id = stridn; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
183 |
event->description = g_strdup(desc); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
184 |
@@ -134,7 +134,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
185 |
evs_list = g_slist_remove(evs_list, event); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
186 |
g_free(event->id); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
187 |
g_free(event->description); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
188 |
- g_free(event); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
189 |
+ g_slice_free(evs_t, event); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
190 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
191 |
return 0; // Ok, deleted |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
192 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
193 |
@@ -213,7 +213,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
194 |
evs_list = g_slist_remove(evs_list, event); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
195 |
g_free(event->id); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
196 |
g_free(event->description); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
197 |
- g_free(event); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
198 |
+ g_slice_free(evs_t, event); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
199 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
200 |
g_slist_free(evs_list); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
201 |
evs_list = NULL; |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
202 |
diff -r eea31b4da8d0 mcabber/mcabber/hbuf.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
203 |
--- a/mcabber/mcabber/hbuf.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
204 |
+++ b/mcabber/mcabber/hbuf.c Wed May 15 12:57:17 2013 +0300 |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
205 |
@@ -29,7 +29,6 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
206 |
#include "utf8.h" |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
207 |
#include "screen.h" |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
208 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
209 |
- |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
210 |
/* This is a private structure type */ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
211 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
212 |
typedef struct { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
213 |
@@ -59,7 +58,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
214 |
{ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
215 |
GList *curr_elt = first_hbuf_elt; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
216 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
217 |
- // Let's add non-persistent blocs if necessary |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
218 |
+ // Let's add non-persistent blocks if necessary |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
219 |
// - If there are '\n' in the string |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
220 |
// - If length > width (and width != 0) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
221 |
while (curr_elt) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
222 |
@@ -95,17 +94,21 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
223 |
end = hbuf_b_curr->ptr_end; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
224 |
hbuf_b_curr->ptr_end = br; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
225 |
// Create another block |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
226 |
- hbuf_b_curr = g_new0(hbuf_block, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
227 |
+ hbuf_b_curr = g_slice_new(hbuf_block); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
228 |
// The block must be persistent after a CR |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
229 |
if (cr) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
230 |
hbuf_b_curr->ptr = hbuf_b_prev->ptr_end + 1; // == cr+1 |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
231 |
hbuf_b_curr->flags = HBB_FLAG_PERSISTENT; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
232 |
} else { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
233 |
hbuf_b_curr->ptr = hbuf_b_prev->ptr_end; // == br |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
234 |
- hbuf_b_curr->flags = 0; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
235 |
+ hbuf_b_curr->flags = 0; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
236 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
237 |
- hbuf_b_curr->ptr_end = end; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
238 |
+ hbuf_b_curr->ptr_end = end; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
239 |
hbuf_b_curr->ptr_end_alloc = hbuf_b_prev->ptr_end_alloc; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
240 |
+ hbuf_b_curr->prefix.timestamp = 0; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
241 |
+ hbuf_b_curr->prefix.flags = 0; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
242 |
+ hbuf_b_curr->prefix.mucnicklen = 0; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
243 |
+ hbuf_b_curr->prefix.xep184 = NULL; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
244 |
// This is OK because insert_before(NULL) == append(): |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
245 |
*p_hbuf = g_list_insert_before(*p_hbuf, curr_elt->next, hbuf_b_curr); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
246 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
247 |
@@ -138,7 +141,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
248 |
textlen = strlen(text); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
249 |
hbb_blocksize = MAX(textlen+1, HBB_BLOCKSIZE); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
250 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
251 |
- hbuf_block_elt = g_new0(hbuf_block, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
252 |
+ hbuf_block_elt = g_slice_new(hbuf_block); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
253 |
hbuf_block_elt->prefix.timestamp = timestamp; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
254 |
hbuf_block_elt->prefix.flags = prefix_flags; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
255 |
hbuf_block_elt->prefix.mucnicklen = mucnicklen; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
256 |
@@ -146,7 +149,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
257 |
if (!*p_hbuf) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
258 |
hbuf_block_elt->ptr = g_new(char, hbb_blocksize); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
259 |
if (!hbuf_block_elt->ptr) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
260 |
- g_free(hbuf_block_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
261 |
+ g_slice_free(hbuf_block, hbuf_block_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
262 |
return; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
263 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
264 |
hbuf_block_elt->flags = HBB_FLAG_ALLOC | HBB_FLAG_PERSISTENT; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
265 |
@@ -208,7 +211,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
266 |
g_free(hbuf_b_elt->ptr); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
267 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
268 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
269 |
- g_free(hbuf_b_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
270 |
+ g_slice_free(hbuf_block, hbuf_b_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
271 |
hbuf_head = *p_hbuf = g_list_delete_link(hbuf_head, hbuf_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
272 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
273 |
n--; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
274 |
@@ -245,7 +248,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
275 |
if (hbuf_b_elt->flags & HBB_FLAG_ALLOC) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
276 |
g_free(hbuf_b_elt->ptr); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
277 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
278 |
- g_free(hbuf_b_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
279 |
+ g_slice_free(hbuf_block, hbuf_b_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
280 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
281 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
282 |
g_list_free(first_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
283 |
@@ -275,7 +278,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
284 |
// Is next line not-persistent? |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
285 |
if (!(hbuf_b_next->flags & HBB_FLAG_PERSISTENT)) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
286 |
hbuf_b_curr->ptr_end = hbuf_b_next->ptr_end; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
287 |
- g_free(hbuf_b_next); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
288 |
+ g_slice_free(hbuf_block, hbuf_b_next); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
289 |
curr_elt = g_list_delete_link(curr_elt, next_elt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
290 |
} else |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
291 |
curr_elt = next_elt; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
292 |
@@ -309,8 +312,8 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
293 |
// hbuf_get_lines(hbuf, n) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
294 |
// Returns an array of n hbb_line pointers |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
295 |
// (The first line will be the line currently pointed by hbuf) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
296 |
-// Note: The caller should free the array, the hbb_line pointers and the |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
297 |
-// text pointers after use. |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
298 |
+// Note: The caller should g_free the array, g_slice_free hbb_line pointers |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
299 |
+// and g_free text pointers after use. |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
300 |
hbb_line **hbuf_get_lines(GList *hbuf, unsigned int n) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
301 |
{ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
302 |
unsigned int i; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
303 |
@@ -349,7 +352,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
304 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
305 |
blk = (hbuf_block*)(hbuf->data); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
306 |
maxlen = blk->ptr_end - blk->ptr; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
307 |
- *array_elt = (hbb_line*)g_new(hbb_line, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
308 |
+ *array_elt = (hbb_line*)g_slice_new(hbb_line); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
309 |
(*array_elt)->timestamp = blk->prefix.timestamp; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
310 |
(*array_elt)->flags = blk->prefix.flags; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
311 |
(*array_elt)->mucnicklen = blk->prefix.mucnicklen; |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
312 |
diff -r eea31b4da8d0 mcabber/mcabber/hooks.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
313 |
--- a/mcabber/mcabber/hooks.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
314 |
+++ b/mcabber/mcabber/hooks.c Wed May 15 12:57:17 2013 +0300 |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
315 |
@@ -99,7 +99,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
316 |
gint priority, gpointer userdata) |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
317 |
{ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
318 |
GSList **hqueue = NULL; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
319 |
- hook_list_data_t *h = g_new(hook_list_data_t, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
320 |
+ hook_list_data_t *h = g_slice_new(hook_list_data_t); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
321 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
322 |
h->handler = handler; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
323 |
h->priority = priority; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
324 |
@@ -148,7 +148,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
325 |
el = g_slist_find_custom(*hqueue, &hid, |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
326 |
(GCompareFunc)_hk_queue_search_cb); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
327 |
if (el) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
328 |
- g_free(el->data); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
329 |
+ g_slice_free(hook_list_data_t, el->data); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
330 |
*hqueue = g_slist_delete_link(*hqueue, el); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
331 |
// Remove hook hash table entry if the hook queue is empty |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
332 |
if (!*hqueue) |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
333 |
diff -r eea31b4da8d0 mcabber/mcabber/modules.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
334 |
--- a/mcabber/mcabber/modules.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
335 |
+++ b/mcabber/mcabber/modules.c Wed May 15 12:57:17 2013 +0300 |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
336 |
@@ -176,7 +176,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
337 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
338 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
339 |
{ // Register module |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
340 |
- loaded_module_t *module = g_new(loaded_module_t, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
341 |
+ loaded_module_t *module = g_slice_new(loaded_module_t); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
342 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
343 |
module->refcount = 1; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
344 |
module->locked = manual; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
345 |
@@ -267,7 +267,7 @@ |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
346 |
// Output this here, as arg may point to module->name |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
347 |
scr_LogPrint(LPRINT_LOGNORM, "Unloaded module %s.", module->name); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
348 |
g_free(module->name); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
349 |
- g_free(module); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
350 |
+ g_slice_free(loaded_module_t, module); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
351 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
352 |
return NULL; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
353 |
} |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
354 |
diff -r eea31b4da8d0 mcabber/mcabber/screen.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
355 |
--- a/mcabber/mcabber/screen.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
356 |
+++ b/mcabber/mcabber/screen.c Wed May 15 12:57:17 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
357 |
@@ -1314,7 +1314,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
358 |
wattrset(win_entry->win, get_color(COLOR_GENERAL)); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
359 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
360 |
g_free(line->text); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
361 |
- g_free(line); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
362 |
+ g_slice_free(hbb_line, line); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
363 |
} else { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
364 |
wclrtobot(win_entry->win); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
365 |
break; |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
366 |
diff -r eea31b4da8d0 mcabber/mcabber/settings.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
367 |
--- a/mcabber/mcabber/settings.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
368 |
+++ b/mcabber/mcabber/settings.c Wed May 15 12:57:17 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
369 |
@@ -458,7 +458,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
370 |
// If value is 0, we do not need to create a structure (that's |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
371 |
// the default value). |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
372 |
if (value) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
373 |
- pgpdata = g_new0(T_pgpopt, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
374 |
+ pgpdata = g_slice_new0(T_pgpopt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
375 |
pgpdata->pgp_disabled = value; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
376 |
g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
377 |
} |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
378 |
@@ -498,7 +498,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
379 |
// If value is 0, we do not need to create a structure (that's |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
380 |
// the default value). |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
381 |
if (value) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
382 |
- pgpdata = g_new0(T_pgpopt, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
383 |
+ pgpdata = g_slice_new0(T_pgpopt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
384 |
pgpdata->pgp_force = value; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
385 |
g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
386 |
} |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
387 |
@@ -538,7 +538,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
388 |
// If keyid is NULL, we do not need to create a structure (that's |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
389 |
// the default value). |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
390 |
if (keyid) { |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
391 |
- pgpdata = g_new0(T_pgpopt, 1); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
392 |
+ pgpdata = g_slice_new0(T_pgpopt); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
393 |
pgpdata->pgp_keyid = g_strdup(keyid); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
394 |
g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
395 |
} |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
396 |
diff -r eea31b4da8d0 mcabber/mcabber/xmpp_iq.c |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
397 |
--- a/mcabber/mcabber/xmpp_iq.c Wed May 15 12:57:08 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
398 |
+++ b/mcabber/mcabber/xmpp_iq.c Wed May 15 12:57:17 2013 +0300 |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
399 |
@@ -765,7 +765,7 @@ |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
400 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
401 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
402 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
403 |
- buf = g_new0(char, 512); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
404 |
+ buf = g_slice_alloc(512); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
405 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
406 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
407 |
query = lm_message_node_add_child(r->node, "query", NULL); |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
408 |
@@ -792,7 +792,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
409 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
410 |
lm_connection_send(c, r, NULL); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
411 |
lm_message_unref(r); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
412 |
- g_free(buf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
413 |
+ g_slice_free1(512, buf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
414 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
415 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
416 |
|
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
417 |
@@ -820,7 +820,7 @@ |
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
418 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
419 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
420 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
421 |
- buf = g_new0(char, 512); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
422 |
+ buf = g_slice_alloc(512); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
423 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
424 |
r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
425 |
query = lm_message_node_add_child(r->node, "time", NULL); |
85
93c3cc0d7891
[refresh] Add round-high-priority.diff, refresh => API 41-42
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
426 |
@@ -857,7 +857,7 @@ |
33
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
427 |
|
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
428 |
lm_connection_send(c, r, NULL); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
429 |
lm_message_unref(r); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
430 |
- g_free(buf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
431 |
+ g_slice_free1(512, buf); |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
432 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
433 |
} |
ce47dc7fc6c0
Add use-gslice and templates
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
434 |