77 - cmd *n_cmd = g_new0(cmd, 1); |
77 - cmd *n_cmd = g_new0(cmd, 1); |
78 + cmd *n_cmd = g_slice_new0(cmd); |
78 + cmd *n_cmd = g_slice_new0(cmd); |
79 strncpy(n_cmd->name, name, 32-1); |
79 strncpy(n_cmd->name, name, 32-1); |
80 n_cmd->help = help; |
80 n_cmd->help = help; |
81 n_cmd->completion_flags[0] = flags_row1; |
81 n_cmd->completion_flags[0] = flags_row1; |
82 @@ -1581,7 +1581,7 @@ |
82 @@ -1571,7 +1571,7 @@ |
83 return NULL; |
83 return NULL; |
84 } |
84 } |
85 |
85 |
86 - msgbuf = g_new0(char, HBB_BLOCKSIZE); |
86 - msgbuf = g_new0(char, HBB_BLOCKSIZE); |
87 + msgbuf = g_slice_alloc0(HBB_BLOCKSIZE); |
87 + msgbuf = g_slice_alloc0(HBB_BLOCKSIZE); |
88 len = fread(msgbuf, 1, HBB_BLOCKSIZE-1, fd); |
88 len = fread(msgbuf, 1, HBB_BLOCKSIZE-1, fd); |
89 fclose(fd); |
89 fclose(fd); |
90 |
90 |
91 @@ -1605,7 +1605,7 @@ |
91 @@ -1595,7 +1595,7 @@ |
92 if (*p || (size_t)(p-msgbuf) != len) { // We're not at the End Of Line... |
92 if (*p || (size_t)(p-msgbuf) != len) { // We're not at the End Of Line... |
93 scr_LogPrint(LPRINT_LOGNORM, "Message file contains " |
93 scr_LogPrint(LPRINT_LOGNORM, "Message file contains " |
94 "invalid characters (%s)", filename); |
94 "invalid characters (%s)", filename); |
95 - g_free(msgbuf); |
95 - g_free(msgbuf); |
96 + g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
96 + g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
97 return NULL; |
97 return NULL; |
98 } |
98 } |
99 |
99 |
100 @@ -1619,7 +1619,7 @@ |
100 @@ -1609,7 +1609,7 @@ |
101 // It could be empty, once the trailing newlines are gone |
101 // It could be empty, once the trailing newlines are gone |
102 if (p == msgbuf && *p == '\n') { |
102 if (p == msgbuf && *p == '\n') { |
103 scr_LogPrint(LPRINT_LOGNORM, "Message file is empty (%s)", filename); |
103 scr_LogPrint(LPRINT_LOGNORM, "Message file is empty (%s)", filename); |
104 - g_free(msgbuf); |
104 - g_free(msgbuf); |
105 + g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
105 + g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
106 return NULL; |
106 return NULL; |
107 } |
107 } |
108 |
108 |
109 @@ -1628,7 +1628,7 @@ |
109 @@ -1618,7 +1618,7 @@ |
110 if (!msgbuf_utf8 && msgbuf) |
110 if (!msgbuf_utf8 && msgbuf) |
111 scr_LogPrint(LPRINT_LOGNORM, "Message file charset conversion error (%s)", |
111 scr_LogPrint(LPRINT_LOGNORM, "Message file charset conversion error (%s)", |
112 filename); |
112 filename); |
113 - g_free(msgbuf); |
113 - g_free(msgbuf); |
114 + g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
114 + g_slice_free1(HBB_BLOCKSIZE, msgbuf); |
115 return msgbuf_utf8; |
115 return msgbuf_utf8; |
116 } |
116 } |
117 |
117 |
118 @@ -1916,7 +1916,7 @@ |
118 @@ -1906,7 +1906,7 @@ |
119 esub = buddy_getsubscription(bud); |
119 esub = buddy_getsubscription(bud); |
120 on_srv = buddy_getonserverflag(bud); |
120 on_srv = buddy_getonserverflag(bud); |
121 |
121 |
122 - buffer = g_new(char, 4096); |
122 - buffer = g_new(char, 4096); |
123 + buffer = g_slice_alloc(4096); |
123 + buffer = g_slice_alloc(4096); |
124 |
124 |
125 if (bjid) { |
125 if (bjid) { |
126 GSList *resources, *p_res; |
126 GSList *resources, *p_res; |
127 @@ -2015,7 +2015,7 @@ |
127 @@ -2005,7 +2005,7 @@ |
128 type == ROSTER_TYPE_GROUP ? "group" : |
128 type == ROSTER_TYPE_GROUP ? "group" : |
129 (type == ROSTER_TYPE_SPECIAL ? "special" : "unknown")); |
129 (type == ROSTER_TYPE_SPECIAL ? "special" : "unknown")); |
130 } |
130 } |
131 - g_free(buffer); |
131 - g_free(buffer); |
132 + g_slice_free1(4096, buffer); |
132 + g_slice_free1(4096, buffer); |
133 |
133 |
134 // Tell the user if this item has an annotation. |
134 // Tell the user if this item has an annotation. |
135 if (type == ROSTER_TYPE_USER || |
135 if (type == ROSTER_TYPE_USER || |
136 @@ -2063,7 +2063,7 @@ |
136 @@ -2054,7 +2054,7 @@ |
137 |
137 |
138 bjid = buddy_getjid(bud); |
138 bjid = buddy_getjid(bud); |
139 |
139 |
140 - buffer = g_new(char, 4096); |
140 - buffer = g_new(char, 4096); |
141 + buffer = g_slice_alloc(4096); |
141 + buffer = g_slice_alloc(4096); |
142 strncpy(buffer, "Room members:", 127); |
142 strncpy(buffer, "Room members:", 127); |
143 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
143 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
144 |
144 |
145 @@ -2118,7 +2118,7 @@ |
145 @@ -2114,7 +2114,7 @@ |
146 g_free(p_res->data); |
146 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0); |
147 } |
147 |
148 g_slist_free(resources); |
148 g_slist_free(resources); |
149 - g_free(buffer); |
149 - g_free(buffer); |
150 + g_slice_free1(4096, buffer); |
150 + g_slice_free1(4096, buffer); |
151 } |
151 } |
152 |
152 |
153 static void move_group_member(gpointer bud, void *groupnamedata) |
153 static void move_group_member(gpointer bud, void *groupnamedata) |
154 @@ -3110,7 +3110,7 @@ |
154 @@ -3137,7 +3137,7 @@ |
155 affil = buddy_getaffil(bud, nick); |
155 affil = buddy_getaffil(bud, nick); |
156 realjid = buddy_getrjid(bud, nick); |
156 realjid = buddy_getrjid(bud, nick); |
157 |
157 |
158 - buffer = g_new(char, 4096); |
158 - buffer = g_new(char, 4096); |
159 + buffer = g_slice_alloc(4096); |
159 + buffer = g_slice_alloc(4096); |
160 |
160 |
161 snprintf(buffer, 4095, "Whois [%s]", nick); |
161 snprintf(buffer, 4095, "Whois [%s]", nick); |
162 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag, 0); |
162 scr_WriteIncomingMessage(bjid, buffer, 0, msg_flag, 0); |
163 @@ -3140,7 +3140,7 @@ |
163 @@ -3167,7 +3167,7 @@ |
164 |
164 |
165 scr_WriteIncomingMessage(bjid, "End of WHOIS", 0, msg_flag, 0); |
165 scr_WriteIncomingMessage(bjid, "End of WHOIS", 0, msg_flag, 0); |
166 |
166 |
167 - g_free(buffer); |
167 - g_free(buffer); |
168 + g_slice_free1(4096, buffer); |
168 + g_slice_free1(4096, buffer); |
169 g_free(nick); |
169 g_free(nick); |
170 if (paramlst) |
170 if (paramlst) |
171 free_arg_lst(paramlst); |
171 free_arg_lst(paramlst); |
172 diff -r eea31b4da8d0 mcabber/mcabber/events.c |
172 diff -r c45500769f0c mcabber/mcabber/events.c |
173 --- a/mcabber/mcabber/events.c Wed May 15 12:57:08 2013 +0300 |
173 --- a/mcabber/mcabber/events.c Wed Nov 12 02:43:42 2014 +0200 |
174 +++ b/mcabber/mcabber/events.c Wed May 15 12:57:17 2013 +0300 |
174 +++ b/mcabber/mcabber/events.c Wed Nov 12 03:30:06 2014 +0200 |
175 @@ -83,7 +83,7 @@ |
175 @@ -83,7 +83,7 @@ |
176 return NULL; |
176 return NULL; |
177 } |
177 } |
178 |
178 |
179 - event = g_new(evs_t, 1); |
179 - event = g_new(evs_t, 1); |
349 - g_free(module); |
349 - g_free(module); |
350 + g_slice_free(loaded_module_t, module); |
350 + g_slice_free(loaded_module_t, module); |
351 |
351 |
352 return NULL; |
352 return NULL; |
353 } |
353 } |
354 diff -r eea31b4da8d0 mcabber/mcabber/screen.c |
354 diff -r c45500769f0c mcabber/mcabber/screen.c |
355 --- a/mcabber/mcabber/screen.c Wed May 15 12:57:08 2013 +0300 |
355 --- a/mcabber/mcabber/screen.c Wed Nov 12 02:43:42 2014 +0200 |
356 +++ b/mcabber/mcabber/screen.c Wed May 15 12:57:17 2013 +0300 |
356 +++ b/mcabber/mcabber/screen.c Wed Nov 12 03:30:06 2014 +0200 |
357 @@ -1314,7 +1314,7 @@ |
357 @@ -1360,7 +1360,7 @@ |
358 wattrset(win_entry->win, get_color(COLOR_GENERAL)); |
358 wattrset(win_entry->win, get_color(COLOR_GENERAL)); |
359 |
359 |
360 g_free(line->text); |
360 g_free(line->text); |
361 - g_free(line); |
361 - g_free(line); |
362 + g_slice_free(hbb_line, line); |
362 + g_slice_free(hbb_line, line); |
363 } else { |
363 } else { |
364 wclrtobot(win_entry->win); |
364 wclrtobot(win_entry->win); |
365 break; |
365 break; |
366 diff -r eea31b4da8d0 mcabber/mcabber/settings.c |
366 @@ -1374,7 +1374,7 @@ |
367 --- a/mcabber/mcabber/settings.c Wed May 15 12:57:08 2013 +0300 |
367 scr_buffer_scroll_lock(1); |
368 +++ b/mcabber/mcabber/settings.c Wed May 15 12:57:17 2013 +0300 |
368 } |
369 @@ -458,7 +458,7 @@ |
369 g_free(line->text); |
|
370 - g_free(line); |
|
371 + g_slice_free(hbb_line, line); |
|
372 } else if (autolock && win_entry->bd->lock) { |
|
373 scr_buffer_scroll_lock(0); |
|
374 } |
|
375 diff -r c45500769f0c mcabber/mcabber/settings.c |
|
376 --- a/mcabber/mcabber/settings.c Wed Nov 12 02:43:42 2014 +0200 |
|
377 +++ b/mcabber/mcabber/settings.c Wed Nov 12 03:30:06 2014 +0200 |
|
378 @@ -457,7 +457,7 @@ |
370 // If value is 0, we do not need to create a structure (that's |
379 // If value is 0, we do not need to create a structure (that's |
371 // the default value). |
380 // the default value). |
372 if (value) { |
381 if (value) { |
373 - pgpdata = g_new0(T_pgpopt, 1); |
382 - pgpdata = g_new0(T_pgpopt, 1); |
374 + pgpdata = g_slice_new0(T_pgpopt); |
383 + pgpdata = g_slice_new0(T_pgpopt); |
375 pgpdata->pgp_disabled = value; |
384 pgpdata->pgp_disabled = value; |
376 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
385 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
377 } |
386 } |
378 @@ -498,7 +498,7 @@ |
387 @@ -497,7 +497,7 @@ |
379 // If value is 0, we do not need to create a structure (that's |
388 // If value is 0, we do not need to create a structure (that's |
380 // the default value). |
389 // the default value). |
381 if (value) { |
390 if (value) { |
382 - pgpdata = g_new0(T_pgpopt, 1); |
391 - pgpdata = g_new0(T_pgpopt, 1); |
383 + pgpdata = g_slice_new0(T_pgpopt); |
392 + pgpdata = g_slice_new0(T_pgpopt); |
384 pgpdata->pgp_force = value; |
393 pgpdata->pgp_force = value; |
385 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
394 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
386 } |
395 } |
387 @@ -538,7 +538,7 @@ |
396 @@ -537,7 +537,7 @@ |
388 // If keyid is NULL, we do not need to create a structure (that's |
397 // If keyid is NULL, we do not need to create a structure (that's |
389 // the default value). |
398 // the default value). |
390 if (keyid) { |
399 if (keyid) { |
391 - pgpdata = g_new0(T_pgpopt, 1); |
400 - pgpdata = g_new0(T_pgpopt, 1); |
392 + pgpdata = g_slice_new0(T_pgpopt); |
401 + pgpdata = g_slice_new0(T_pgpopt); |
393 pgpdata->pgp_keyid = g_strdup(keyid); |
402 pgpdata->pgp_keyid = g_strdup(keyid); |
394 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
403 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
395 } |
404 } |
396 diff -r eea31b4da8d0 mcabber/mcabber/xmpp_iq.c |
405 diff -r c45500769f0c mcabber/mcabber/xmpp_iq.c |
397 --- a/mcabber/mcabber/xmpp_iq.c Wed May 15 12:57:08 2013 +0300 |
406 --- a/mcabber/mcabber/xmpp_iq.c Wed Nov 12 02:43:42 2014 +0200 |
398 +++ b/mcabber/mcabber/xmpp_iq.c Wed May 15 12:57:17 2013 +0300 |
407 +++ b/mcabber/mcabber/xmpp_iq.c Wed Nov 12 03:30:06 2014 +0200 |
399 @@ -765,7 +765,7 @@ |
408 @@ -765,7 +765,7 @@ |
400 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
409 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
401 } |
410 } |
402 |
411 |
403 - buf = g_new0(char, 512); |
412 - buf = g_new0(char, 512); |