libnih

Merge lp:~jamesodhunt/libnih/bug-1123588-gcc-malloc-attribute into lp:libnih

  1. bug-1123588-gcc-malloc-attribute
  2. Merge into trunk
Proposed by James Hunt
Status: Needs review
Proposed branch: lp:~jamesodhunt/libnih/bug-1123588-gcc-malloc-attribute
Merge into: lp:libnih
Diff against target: 1077 lines (+136/-132)
41 files modified
ChangeLog (+6/-0)
nih-dbus-tool/argument.h (+1/-1)
nih-dbus-tool/demarshal.c (+3/-3)
nih-dbus-tool/demarshal.h (+1/-1)
nih-dbus-tool/indent.h (+2/-2)
nih-dbus-tool/interface.h (+8/-8)
nih-dbus-tool/main.c (+2/-2)
nih-dbus-tool/marshal.c (+3/-3)
nih-dbus-tool/marshal.h (+1/-1)
nih-dbus-tool/method.h (+7/-7)
nih-dbus-tool/node.h (+4/-4)
nih-dbus-tool/output.h (+2/-2)
nih-dbus-tool/parse.h (+2/-2)
nih-dbus-tool/property.h (+9/-9)
nih-dbus-tool/signal.h (+4/-4)
nih-dbus-tool/symbol.c (+2/-2)
nih-dbus-tool/symbol.h (+4/-4)
nih-dbus-tool/tests/test_main.c (+2/-2)
nih-dbus-tool/type.h (+15/-15)
nih-dbus/dbus_object.h (+1/-2)
nih-dbus/dbus_pending_data.h (+1/-1)
nih-dbus/dbus_proxy.c (+2/-2)
nih-dbus/dbus_proxy.h (+2/-2)
nih-dbus/dbus_util.h (+1/-1)
nih/alloc.c (+1/-2)
nih/alloc.h (+2/-2)
nih/child.h (+1/-1)
nih/command.h (+1/-1)
nih/config.h (+5/-5)
nih/file.c (+1/-1)
nih/file.h (+1/-1)
nih/hash.h (+1/-1)
nih/io.h (+8/-8)
nih/list.h (+2/-2)
nih/main.h (+1/-1)
nih/option.h (+2/-2)
nih/signal.h (+1/-1)
nih/string.h (+17/-17)
nih/timer.h (+4/-4)
nih/tree.h (+2/-2)
nih/watch.h (+1/-1)
To merge this branch: bzr merge lp:~jamesodhunt/libnih/bug-1123588-gcc-malloc-attribute
Reviewer Review Type Date Requested Status
Scott James Remnant Pending
Review via email: mp+150998@code.launchpad.net

Description of the change

* Removal of gcc 'malloc' function attribute resulting from
  a clarification in its description which makes its use invalid.
  (LP: #1123588).

To post a comment you must log in.

Unmerged revisions

1055. By James Hunt

* Removal of gcc 'malloc' function attribute resulting from
  a clarification in its description which makes its use invalid.
  (LP: #1123588).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-09-01 18:41:03 +0000
3+++ ChangeLog 2013-02-28 11:39:20 +0000
4@@ -1,3 +1,9 @@
5+2013-02-28 James Hunt <james.hunt@ubuntu.com>
6+
7+ * Removal of gcc 'malloc' function attribute resulting from
8+ a clarification in its description which makes its use invalid.
9+ (LP: #1123588).
10+
11 2011-08-31 James Hunt <james.hunt@ubuntu.com>
12
13 * nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c
14
15=== modified file 'nih-dbus-tool/argument.h'
16--- nih-dbus-tool/argument.h 2009-06-23 09:29:37 +0000
17+++ nih-dbus-tool/argument.h 2013-02-28 11:39:20 +0000
18@@ -61,7 +61,7 @@
19
20 Argument *argument_new (const void *parent, const char *name,
21 const char *type, NihDBusArgDir direction)
22- __attribute__ ((warn_unused_result, malloc));
23+ __attribute__ ((warn_unused_result));
24
25 int argument_start_tag (XML_Parser xmlp, const char *tag,
26 char * const *attr)
27
28=== modified file 'nih-dbus-tool/demarshal.c'
29--- nih-dbus-tool/demarshal.c 2009-07-09 13:07:52 +0000
30+++ nih-dbus-tool/demarshal.c 2013-02-28 11:39:20 +0000
31@@ -51,7 +51,7 @@
32 const char *prefix, const char *interface_symbol,
33 const char *member_symbol, const char *symbol,
34 NihList *structs)
35- __attribute__ ((warn_unused_result, malloc));
36+ __attribute__ ((warn_unused_result));
37 static char *demarshal_array (const void *parent,
38 DBusSignatureIter *iter,
39 const char *parent_name,
40@@ -62,7 +62,7 @@
41 const char *prefix, const char *interface_symbol,
42 const char *member_symbol, const char *symbol,
43 NihList *structs)
44- __attribute__ ((warn_unused_result, malloc));
45+ __attribute__ ((warn_unused_result));
46 static char *demarshal_struct (const void *parent,
47 DBusSignatureIter *iter,
48 const char *parent_name,
49@@ -73,7 +73,7 @@
50 const char *prefix, const char *interface_symbol,
51 const char *member_symbol, const char *symbol,
52 NihList *structs)
53- __attribute__ ((warn_unused_result, malloc));
54+ __attribute__ ((warn_unused_result));
55
56
57 /**
58
59=== modified file 'nih-dbus-tool/demarshal.h'
60--- nih-dbus-tool/demarshal.h 2009-06-26 12:54:59 +0000
61+++ nih-dbus-tool/demarshal.h 2013-02-28 11:39:20 +0000
62@@ -37,7 +37,7 @@
63 const char *prefix, const char *interface_symbol,
64 const char *member_symbol, const char *symbol,
65 NihList *structs)
66- __attribute__ ((warn_unused_result, malloc));
67+ __attribute__ ((warn_unused_result));
68
69 NIH_END_EXTERN
70
71
72=== modified file 'nih-dbus-tool/indent.h'
73--- nih-dbus-tool/indent.h 2009-06-23 09:29:37 +0000
74+++ nih-dbus-tool/indent.h 2013-02-28 11:39:20 +0000
75@@ -26,9 +26,9 @@
76 NIH_BEGIN_EXTERN
77
78 char *indent (char **str, const void *parent, int level)
79- __attribute__ ((warn_unused_result, malloc));
80+ __attribute__ ((warn_unused_result));
81 char *comment (char **str, const void *parent)
82- __attribute__ ((warn_unused_result, malloc));
83+ __attribute__ ((warn_unused_result));
84
85 NIH_END_EXTERN
86
87
88=== modified file 'nih-dbus-tool/interface.h'
89--- nih-dbus-tool/interface.h 2009-06-29 19:29:09 +0000
90+++ nih-dbus-tool/interface.h 2013-02-28 11:39:20 +0000
91@@ -61,7 +61,7 @@
92
93 Interface *interface_new (const void *parent,
94 const char *name)
95- __attribute__ ((warn_unused_result, malloc));
96+ __attribute__ ((warn_unused_result));
97
98 int interface_start_tag (XML_Parser xmlp,
99 const char *tag,
100@@ -81,26 +81,26 @@
101 Interface *interface,
102 int with_handlers,
103 NihList *prototypes)
104- __attribute__ ((warn_unused_result, malloc));
105+ __attribute__ ((warn_unused_result));
106 char * interface_signals_array (const void *parent,
107 const char *prefix,
108 Interface *interface,
109 int with_filters,
110 NihList *prototypes)
111- __attribute__ ((warn_unused_result, malloc));
112+ __attribute__ ((warn_unused_result));
113 char * interface_properties_array (const void *parent,
114 const char *prefix,
115 Interface *interface,
116 int with_handlers,
117 NihList *prototypes)
118- __attribute__ ((warn_unused_result, malloc));
119+ __attribute__ ((warn_unused_result));
120
121 char * interface_struct (const void *parent,
122 const char *prefix,
123 Interface *interface,
124 int object,
125 NihList *prototypes)
126- __attribute__ ((warn_unused_result, malloc));
127+ __attribute__ ((warn_unused_result));
128
129
130 char * interface_proxy_get_all_function (const void *parent,
131@@ -108,7 +108,7 @@
132 Interface *interface,
133 NihList *prototypes,
134 NihList *structs)
135- __attribute__ ((warn_unused_result, malloc));
136+ __attribute__ ((warn_unused_result));
137
138 char * interface_proxy_get_all_notify_function (const void *parent,
139 const char *prefix,
140@@ -116,14 +116,14 @@
141 NihList *prototypes,
142 NihList *typedefs,
143 NihList *structs)
144- __attribute__ ((warn_unused_result, malloc));
145+ __attribute__ ((warn_unused_result));
146
147 char * interface_proxy_get_all_sync_function (const void *parent,
148 const char *prefix,
149 Interface *interface,
150 NihList *prototypes,
151 NihList *structs)
152- __attribute__ ((warn_unused_result, malloc));
153+ __attribute__ ((warn_unused_result));
154
155 NIH_END_EXTERN
156
157
158=== modified file 'nih-dbus-tool/main.c'
159--- nih-dbus-tool/main.c 2009-11-28 20:25:03 +0000
160+++ nih-dbus-tool/main.c 2013-02-28 11:39:20 +0000
161@@ -52,10 +52,10 @@
162 /* Prototypes for local functions */
163 char *source_file_path (const void *parent, const char *output_path,
164 const char *filename)
165- __attribute__ ((warn_unused_result, malloc));
166+ __attribute__ ((warn_unused_result));
167 char *header_file_path (const void *parent, const char *output_path,
168 const char *filename)
169- __attribute__ ((warn_unused_result, malloc));
170+ __attribute__ ((warn_unused_result));
171
172
173 /**
174
175=== modified file 'nih-dbus-tool/marshal.c'
176--- nih-dbus-tool/marshal.c 2009-06-30 11:41:47 +0000
177+++ nih-dbus-tool/marshal.c 2013-02-28 11:39:20 +0000
178@@ -49,7 +49,7 @@
179 const char *prefix, const char *interface_symbol,
180 const char *member_symbol, const char *symbol,
181 NihList *structs)
182- __attribute__ ((warn_unused_result, malloc));
183+ __attribute__ ((warn_unused_result));
184 static char *marshal_array (const void *parent,
185 DBusSignatureIter *iter,
186 const char *iter_name, const char *name,
187@@ -58,7 +58,7 @@
188 const char *prefix, const char *interface_symbol,
189 const char *member_symbol, const char *symbol,
190 NihList *structs)
191- __attribute__ ((warn_unused_result, malloc));
192+ __attribute__ ((warn_unused_result));
193 static char *marshal_struct (const void *parent,
194 DBusSignatureIter *iter,
195 const char *iter_name, const char *name,
196@@ -67,7 +67,7 @@
197 const char *prefix, const char *interface_symbol,
198 const char *member_symbol, const char *symbol,
199 NihList *structs)
200- __attribute__ ((warn_unused_result, malloc));
201+ __attribute__ ((warn_unused_result));
202
203
204 /**
205
206=== modified file 'nih-dbus-tool/marshal.h'
207--- nih-dbus-tool/marshal.h 2009-06-26 12:29:08 +0000
208+++ nih-dbus-tool/marshal.h 2013-02-28 11:39:20 +0000
209@@ -35,7 +35,7 @@
210 const char *prefix, const char *interface_symbol,
211 const char *member_symbol, const char *symbol,
212 NihList *structs)
213- __attribute__ ((warn_unused_result, malloc));
214+ __attribute__ ((warn_unused_result));
215
216 NIH_END_EXTERN
217
218
219=== modified file 'nih-dbus-tool/method.h'
220--- nih-dbus-tool/method.h 2009-06-26 15:38:49 +0000
221+++ nih-dbus-tool/method.h 2013-02-28 11:39:20 +0000
222@@ -62,7 +62,7 @@
223 int method_name_valid (const char *name);
224
225 Method * method_new (const void *parent, const char *name)
226- __attribute__ ((warn_unused_result, malloc));
227+ __attribute__ ((warn_unused_result));
228
229 int method_start_tag (XML_Parser xmlp, const char *tag,
230 char * const *attr)
231@@ -82,33 +82,33 @@
232 Interface *interface, Method *method,
233 NihList *prototypes, NihList *handlers,
234 NihList *structs)
235- __attribute__ ((warn_unused_result, malloc));
236+ __attribute__ ((warn_unused_result));
237
238 char * method_reply_function (const void *parent, const char *prefix,
239 Interface *interface, Method *method,
240 NihList *prototypes, NihList *structs)
241- __attribute__ ((warn_unused_result, malloc));
242+ __attribute__ ((warn_unused_result));
243
244 char * method_proxy_function (const void *parent, const char *prefix,
245 Interface *interface, Method *method,
246 NihList *prototypes, NihList *structs)
247- __attribute__ ((warn_unused_result, malloc));
248+ __attribute__ ((warn_unused_result));
249
250 char * method_proxy_notify_function (const void *parent, const char *prefix,
251 Interface *interface, Method *method,
252 NihList *prototypes, NihList *typedefs,
253 NihList *structs)
254- __attribute__ ((warn_unused_result, malloc));
255+ __attribute__ ((warn_unused_result));
256
257 char * method_proxy_sync_function (const void *parent, const char *prefix,
258 Interface *interface, Method *method,
259 NihList *prototypes, NihList *structs)
260- __attribute__ ((warn_unused_result, malloc));
261+ __attribute__ ((warn_unused_result));
262
263 char * method_args_array (const void *parent, const char *prefix,
264 Interface *interface, Method *method,
265 NihList *prototypes)
266- __attribute__ ((warn_unused_result, malloc));
267+ __attribute__ ((warn_unused_result));
268
269 NIH_END_EXTERN
270
271
272=== modified file 'nih-dbus-tool/node.h'
273--- nih-dbus-tool/node.h 2009-06-28 14:00:11 +0000
274+++ nih-dbus-tool/node.h 2013-02-28 11:39:20 +0000
275@@ -47,7 +47,7 @@
276 int node_path_valid (const char *name);
277
278 Node * node_new (const void *parent, const char *path)
279- __attribute__ ((warn_unused_result, malloc));
280+ __attribute__ ((warn_unused_result));
281
282 int node_start_tag (XML_Parser xmlp, const char *tag,
283 char * const *attr)
284@@ -59,18 +59,18 @@
285
286 char * node_interfaces_array (const void *parent, const char *prefix,
287 Node *node, int object, NihList *prototypes)
288- __attribute__ ((warn_unused_result, malloc));
289+ __attribute__ ((warn_unused_result));
290
291 char * node_object_functions (const void *parent, const char *prefix,
292 Node *node,
293 NihList *prototypes, NihList *handlers,
294 NihList *structs, NihList *externs)
295- __attribute__ ((warn_unused_result, malloc));
296+ __attribute__ ((warn_unused_result));
297 char * node_proxy_functions (const void *parent, const char *prefix,
298 Node *node,
299 NihList *prototypes, NihList *structs,
300 NihList *typedefs, NihList *externs)
301- __attribute__ ((warn_unused_result, malloc));
302+ __attribute__ ((warn_unused_result));
303
304 NIH_END_EXTERN
305
306
307=== modified file 'nih-dbus-tool/output.h'
308--- nih-dbus-tool/output.h 2009-11-21 18:45:44 +0000
309+++ nih-dbus-tool/output.h 2013-02-28 11:39:20 +0000
310@@ -35,9 +35,9 @@
311 __attribute__ ((warn_unused_result));
312
313 char *output_preamble (const void *parent, const char *path)
314- __attribute__ ((warn_unused_result, malloc));
315+ __attribute__ ((warn_unused_result));
316 char *output_sentinel (const void *parent, const char *path)
317- __attribute__ ((warn_unused_result, malloc));
318+ __attribute__ ((warn_unused_result));
319
320 NIH_END_EXTERN
321
322
323=== modified file 'nih-dbus-tool/parse.h'
324--- nih-dbus-tool/parse.h 2009-06-23 09:29:37 +0000
325+++ nih-dbus-tool/parse.h 2013-02-28 11:39:20 +0000
326@@ -95,7 +95,7 @@
327
328 ParseStack *parse_stack_push (const void *parent, NihList *stack,
329 ParseStackType type, void *data)
330- __attribute__ ((warn_unused_result, malloc));
331+ __attribute__ ((warn_unused_result));
332 ParseStack *parse_stack_top (NihList *stack);
333
334 void parse_start_tag (XML_Parser xmlp, const char *tag,
335@@ -103,7 +103,7 @@
336 void parse_end_tag (XML_Parser xmlp, const char *tag);
337
338 Node * parse_xml (const void *parent, int fd, const char *filename)
339- __attribute__ ((warn_unused_result, malloc));
340+ __attribute__ ((warn_unused_result));
341
342 NIH_END_EXTERN
343
344
345=== modified file 'nih-dbus-tool/property.h'
346--- nih-dbus-tool/property.h 2009-06-26 17:28:13 +0000
347+++ nih-dbus-tool/property.h 2013-02-28 11:39:20 +0000
348@@ -65,7 +65,7 @@
349 const char *name,
350 const char *type,
351 NihDBusAccess access)
352- __attribute__ ((warn_unused_result, malloc));
353+ __attribute__ ((warn_unused_result));
354
355 int property_start_tag (XML_Parser xmlp, const char *tag,
356 char * const *attr)
357@@ -88,7 +88,7 @@
358 NihList *prototypes,
359 NihList *handlers,
360 NihList *structs)
361- __attribute__ ((warn_unused_result, malloc));
362+ __attribute__ ((warn_unused_result));
363 char * property_object_set_function (const void *parent,
364 const char *prefix,
365 Interface *interface,
366@@ -96,7 +96,7 @@
367 NihList *prototypes,
368 NihList *handlers,
369 NihList *structs)
370- __attribute__ ((warn_unused_result, malloc));
371+ __attribute__ ((warn_unused_result));
372
373 char * property_proxy_get_function (const void *parent,
374 const char *prefix,
375@@ -104,7 +104,7 @@
376 Property *property,
377 NihList *prototypes,
378 NihList *structs)
379- __attribute__ ((warn_unused_result, malloc));
380+ __attribute__ ((warn_unused_result));
381 char * property_proxy_get_notify_function (const void *parent,
382 const char *prefix,
383 Interface *interface,
384@@ -112,7 +112,7 @@
385 NihList *prototypes,
386 NihList *typedefs,
387 NihList *structs)
388- __attribute__ ((warn_unused_result, malloc));
389+ __attribute__ ((warn_unused_result));
390
391 char * property_proxy_set_function (const void *parent,
392 const char *prefix,
393@@ -120,7 +120,7 @@
394 Property *property,
395 NihList *prototypes,
396 NihList *structs)
397- __attribute__ ((warn_unused_result, malloc));
398+ __attribute__ ((warn_unused_result));
399 char * property_proxy_set_notify_function (const void *parent,
400 const char *prefix,
401 Interface *interface,
402@@ -128,7 +128,7 @@
403 NihList *prototypes,
404 NihList *typedefs,
405 NihList *structs)
406- __attribute__ ((warn_unused_result, malloc));
407+ __attribute__ ((warn_unused_result));
408
409 char * property_proxy_get_sync_function (const void *parent,
410 const char *prefix,
411@@ -136,14 +136,14 @@
412 Property *property,
413 NihList *prototypes,
414 NihList *structs)
415- __attribute__ ((warn_unused_result, malloc));
416+ __attribute__ ((warn_unused_result));
417 char * property_proxy_set_sync_function (const void *parent,
418 const char *prefix,
419 Interface *interface,
420 Property *property,
421 NihList *prototypes,
422 NihList *structs)
423- __attribute__ ((warn_unused_result, malloc));
424+ __attribute__ ((warn_unused_result));
425
426 NIH_END_EXTERN
427
428
429=== modified file 'nih-dbus-tool/signal.h'
430--- nih-dbus-tool/signal.h 2009-06-26 15:55:15 +0000
431+++ nih-dbus-tool/signal.h 2013-02-28 11:39:20 +0000
432@@ -58,7 +58,7 @@
433 int signal_name_valid (const char *name);
434
435 Signal * signal_new (const void *parent, const char *name)
436- __attribute__ ((warn_unused_result, malloc));
437+ __attribute__ ((warn_unused_result));
438
439 int signal_start_tag (XML_Parser xmlp, const char *tag,
440 char * const *attr)
441@@ -76,18 +76,18 @@
442 char * signal_object_function (const void *parent, const char *prefix,
443 Interface *interface, Signal *signal,
444 NihList *prototypes, NihList *structs)
445- __attribute__ ((warn_unused_result, malloc));
446+ __attribute__ ((warn_unused_result));
447
448 char * signal_proxy_function (const void *parent, const char *prefix,
449 Interface *interface, Signal *signal,
450 NihList *prototypes, NihList *typedefs,
451 NihList *structs)
452- __attribute__ ((warn_unused_result, malloc));
453+ __attribute__ ((warn_unused_result));
454
455 char * signal_args_array (const void *parent, const char *prefix,
456 Interface *interface, Signal *signal,
457 NihList *prototypes)
458- __attribute__ ((warn_unused_result, malloc));
459+ __attribute__ ((warn_unused_result));
460
461 NIH_END_EXTERN
462
463
464=== modified file 'nih-dbus-tool/symbol.c'
465--- nih-dbus-tool/symbol.c 2009-06-26 16:31:59 +0000
466+++ nih-dbus-tool/symbol.c 2013-02-28 11:39:20 +0000
467@@ -40,10 +40,10 @@
468 /* Prototypes for static functions */
469 static char *symbol_strcat_interface (char **str, const void *parent,
470 const char *format, ...)
471- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc));
472+ __attribute__ ((format (printf, 3, 4), warn_unused_result));
473 static char *symbol_strcat_title (char **str, const void *parent,
474 const char *format, ...)
475- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc));
476+ __attribute__ ((format (printf, 3, 4), warn_unused_result));
477
478
479 /**
480
481=== modified file 'nih-dbus-tool/symbol.h'
482--- nih-dbus-tool/symbol.h 2009-06-23 09:29:37 +0000
483+++ nih-dbus-tool/symbol.h 2013-02-28 11:39:20 +0000
484@@ -28,22 +28,22 @@
485 int symbol_valid (const char *symbol);
486
487 char *symbol_from_name (const void *parent, const char *name)
488- __attribute__ ((warn_unused_result, malloc));
489+ __attribute__ ((warn_unused_result));
490
491 char *symbol_impl (const void *parent, const char *prefix,
492 const char *interface_name, const char *name,
493 const char *postfix)
494- __attribute__ ((warn_unused_result, malloc));
495+ __attribute__ ((warn_unused_result));
496
497 char *symbol_extern (const void *parent, const char *prefix,
498 const char *interface_symbol, const char *midfix,
499 const char *symbol, const char *postfix)
500- __attribute__ ((warn_unused_result, malloc));
501+ __attribute__ ((warn_unused_result));
502
503 char *symbol_typedef (const void *parent, const char *prefix,
504 const char *interface_symbol, const char *midfix,
505 const char *symbol, const char *postfix)
506- __attribute__ ((warn_unused_result, malloc));
507+ __attribute__ ((warn_unused_result));
508
509 NIH_END_EXTERN
510
511
512=== modified file 'nih-dbus-tool/tests/test_main.c'
513--- nih-dbus-tool/tests/test_main.c 2009-06-23 09:29:37 +0000
514+++ nih-dbus-tool/tests/test_main.c 2013-02-28 11:39:20 +0000
515@@ -100,10 +100,10 @@
516
517 extern char *source_file_path (const void *parent, const char *output_path,
518 const char *filename)
519- __attribute__ ((warn_unused_result, malloc));
520+ __attribute__ ((warn_unused_result));
521 extern char *header_file_path (const void *parent, const char *output_path,
522 const char *filename)
523- __attribute__ ((warn_unused_result, malloc));
524+ __attribute__ ((warn_unused_result));
525
526 void
527 test_source_file_path (void)
528
529=== modified file 'nih-dbus-tool/type.h'
530--- nih-dbus-tool/type.h 2009-06-26 10:56:34 +0000
531+++ nih-dbus-tool/type.h 2013-02-28 11:39:20 +0000
532@@ -94,43 +94,43 @@
533
534 char * type_of (const void * parent,
535 DBusSignatureIter *iter)
536- __attribute__ ((warn_unused_result, malloc));
537+ __attribute__ ((warn_unused_result));
538
539 TypeVar * type_var_new (const void *parent, const char *type,
540 const char *name)
541- __attribute__ ((warn_unused_result, malloc));
542+ __attribute__ ((warn_unused_result));
543 char * type_var_to_string (const void *parent, TypeVar *var)
544- __attribute__ ((warn_unused_result, malloc));
545+ __attribute__ ((warn_unused_result));
546 char * type_var_layout (const void *parent, NihList *vars)
547- __attribute__ ((warn_unused_result, malloc));
548+ __attribute__ ((warn_unused_result));
549
550 TypeFunc * type_func_new (const void *parent, const char *type,
551 const char *name)
552- __attribute__ ((warn_unused_result, malloc));
553+ __attribute__ ((warn_unused_result));
554 char * type_func_to_string (const void *parent, TypeFunc *func)
555- __attribute__ ((warn_unused_result, malloc));
556+ __attribute__ ((warn_unused_result));
557 char * type_func_to_typedef (const void *parent, TypeFunc *func)
558- __attribute__ ((warn_unused_result, malloc));
559+ __attribute__ ((warn_unused_result));
560 char * type_func_layout (const void *parent, NihList *funcs)
561- __attribute__ ((warn_unused_result, malloc));
562+ __attribute__ ((warn_unused_result));
563
564 TypeStruct *type_struct_new (const void *parent, const char *name)
565- __attribute__ ((warn_unused_result, malloc));
566+ __attribute__ ((warn_unused_result));
567 char * type_struct_to_string (const void *parent, TypeStruct *structure)
568- __attribute__ ((warn_unused_result, malloc));
569+ __attribute__ ((warn_unused_result));
570
571 char * type_to_const (char **type, const void *parent)
572- __attribute__ ((warn_unused_result, malloc));
573+ __attribute__ ((warn_unused_result));
574 char * type_to_pointer (char **type, const void *parent)
575- __attribute__ ((warn_unused_result, malloc));
576+ __attribute__ ((warn_unused_result));
577 char * type_to_static (char **type, const void *parent)
578- __attribute__ ((warn_unused_result, malloc));
579+ __attribute__ ((warn_unused_result));
580 char * type_to_extern (char **type, const void *parent)
581- __attribute__ ((warn_unused_result, malloc));
582+ __attribute__ ((warn_unused_result));
583
584 char * type_strcat_assert (char **block, const void *parent,
585 TypeVar *var, TypeVar *prev, TypeVar *next)
586- __attribute__ ((warn_unused_result, malloc));
587+ __attribute__ ((warn_unused_result));
588
589 NIH_END_EXTERN
590
591
592=== modified file 'nih-dbus/dbus_object.h'
593--- nih-dbus/dbus_object.h 2009-06-23 09:29:37 +0000
594+++ nih-dbus/dbus_object.h 2013-02-28 11:39:20 +0000
595@@ -61,8 +61,7 @@
596 DBusConnection *connection,
597 const char *path,
598 const NihDBusInterface **interfaces,
599- void *data)
600- __attribute__ ((malloc));
601+ void *data);
602
603 NIH_END_EXTERN
604
605
606=== modified file 'nih-dbus/dbus_pending_data.h'
607--- nih-dbus/dbus_pending_data.h 2009-06-23 09:29:37 +0000
608+++ nih-dbus/dbus_pending_data.h 2013-02-28 11:39:20 +0000
609@@ -104,7 +104,7 @@
610 NihDBusReplyHandler handler,
611 NihDBusErrorHandler error_handler,
612 void *data)
613- __attribute__ ((warn_unused_result, malloc));
614+ __attribute__ ((warn_unused_result));
615
616 NIH_END_EXTERN
617
618
619=== modified file 'nih-dbus/dbus_proxy.c'
620--- nih-dbus/dbus_proxy.c 2009-07-02 16:18:00 +0000
621+++ nih-dbus/dbus_proxy.c 2013-02-28 11:39:20 +0000
622@@ -46,11 +46,11 @@
623 __attribute__ ((warn_unused_result));
624 static char *nih_dbus_proxy_name_rule (const void *parent,
625 NihDBusProxy *proxy)
626- __attribute__ ((warn_unused_result, malloc));
627+ __attribute__ ((warn_unused_result));
628 static int nih_dbus_proxy_signal_destroy (NihDBusProxySignal *proxied);
629 static char *nih_dbus_proxy_signal_rule (const void *parent,
630 NihDBusProxySignal *proxied)
631- __attribute__ ((warn_unused_result, malloc));
632+ __attribute__ ((warn_unused_result));
633
634 /* Prototypes for handler functions */
635 static DBusHandlerResult nih_dbus_proxy_name_owner_changed (DBusConnection *connection,
636
637=== modified file 'nih-dbus/dbus_proxy.h'
638--- nih-dbus/dbus_proxy.h 2009-07-02 16:18:00 +0000
639+++ nih-dbus/dbus_proxy.h 2013-02-28 11:39:20 +0000
640@@ -146,14 +146,14 @@
641 const char *name, const char *path,
642 NihDBusLostHandler lost_handler,
643 void *data)
644- __attribute__ ((warn_unused_result, malloc));
645+ __attribute__ ((warn_unused_result));
646
647 NihDBusProxySignal *nih_dbus_proxy_connect (NihDBusProxy *proxy,
648 const NihDBusInterface *interface,
649 const char *name,
650 NihDBusSignalHandler handler,
651 void *data)
652- __attribute__ ((warn_unused_result, malloc));
653+ __attribute__ ((warn_unused_result));
654
655 NIH_END_EXTERN
656
657
658=== modified file 'nih-dbus/dbus_util.h'
659--- nih-dbus/dbus_util.h 2009-06-23 09:29:37 +0000
660+++ nih-dbus/dbus_util.h 2013-02-28 11:39:20 +0000
661@@ -26,7 +26,7 @@
662 NIH_BEGIN_EXTERN
663
664 char *nih_dbus_path (const void *parent, const char *root, ...)
665- __attribute__ ((sentinel, warn_unused_result, malloc));
666+ __attribute__ ((sentinel, warn_unused_result));
667
668 NIH_END_EXTERN
669
670
671=== modified file 'nih/alloc.c'
672--- nih/alloc.c 2009-11-24 10:49:40 +0000
673+++ nih/alloc.c 2013-02-28 11:39:20 +0000
674@@ -119,8 +119,7 @@
675 static inline int nih_alloc_context_free (NihAllocCtx *ctx);
676
677 static inline NihAllocRef *nih_alloc_ref_new (NihAllocCtx *parent,
678- NihAllocCtx *child)
679- __attribute__ ((malloc));
680+ NihAllocCtx *child);
681 static inline void nih_alloc_ref_free (NihAllocRef *ref);
682 static inline NihAllocRef *nih_alloc_ref_lookup (NihAllocCtx *parent,
683 NihAllocCtx *child);
684
685=== modified file 'nih/alloc.h'
686--- nih/alloc.h 2011-01-06 09:28:39 +0000
687+++ nih/alloc.h 2013-02-28 11:39:20 +0000
688@@ -307,11 +307,11 @@
689 NIH_BEGIN_EXTERN
690
691 void * nih_alloc (const void *parent, size_t size)
692- __attribute__ ((warn_unused_result, malloc));
693+ __attribute__ ((warn_unused_result));
694
695 void * nih_realloc (void *ptr, const void *parent,
696 size_t size)
697- __attribute__ ((warn_unused_result, malloc));
698+ __attribute__ ((warn_unused_result));
699
700 int nih_free (void *ptr);
701 int nih_discard (void *ptr);
702
703=== modified file 'nih/child.h'
704--- nih/child.h 2009-07-29 10:19:50 +0000
705+++ nih/child.h 2013-02-28 11:39:20 +0000
706@@ -98,7 +98,7 @@
707 NihChildWatch *nih_child_add_watch (const void *parent, pid_t pid,
708 NihChildEvents events,
709 NihChildHandler handler, void *data)
710- __attribute__ ((warn_unused_result, malloc));
711+ __attribute__ ((warn_unused_result));
712
713 void nih_child_poll (void);
714
715
716=== modified file 'nih/command.h'
717--- nih/command.h 2009-06-23 09:29:37 +0000
718+++ nih/command.h 2013-02-28 11:39:20 +0000
719@@ -123,7 +123,7 @@
720
721 NihCommand *nih_command_join (const void *parent,
722 const NihCommand *a, const NihCommand *b)
723- __attribute__ ((warn_unused_result, malloc));
724+ __attribute__ ((warn_unused_result));
725
726 NIH_END_EXTERN
727
728
729=== modified file 'nih/config.h'
730--- nih/config.h 2009-06-23 09:29:37 +0000
731+++ nih/config.h 2013-02-28 11:39:20 +0000
732@@ -140,10 +140,10 @@
733 char * nih_config_next_token (const void *parent, const char *file,
734 size_t len, size_t *pos, size_t *lineno,
735 const char *delim, int dequote)
736- __attribute__ ((warn_unused_result, malloc));
737+ __attribute__ ((warn_unused_result));
738 char * nih_config_next_arg (const void *parent, const char *file,
739 size_t len, size_t *pos, size_t *lineno)
740- __attribute__ ((warn_unused_result, malloc));
741+ __attribute__ ((warn_unused_result));
742 void nih_config_next_line (const char *file, size_t len,
743 size_t *pos, size_t *lineno);
744
745@@ -155,15 +155,15 @@
746
747 char ** nih_config_parse_args (const void *parent, const char *file,
748 size_t len, size_t *pos, size_t *lineno)
749- __attribute__ ((warn_unused_result, malloc));
750+ __attribute__ ((warn_unused_result));
751 char * nih_config_parse_command (const void *parent, const char *file,
752 size_t len, size_t *pos, size_t *lineno)
753- __attribute__ ((warn_unused_result, malloc));
754+ __attribute__ ((warn_unused_result));
755
756 char * nih_config_parse_block (const void *parent, const char *file,
757 size_t len, size_t *pos, size_t *lineno,
758 const char *type)
759- __attribute__ ((warn_unused_result, malloc));
760+ __attribute__ ((warn_unused_result));
761 int nih_config_skip_block (const char *file, size_t len,
762 size_t *lineno, size_t *pos,
763 const char *type, size_t *endpos)
764
765=== modified file 'nih/file.c'
766--- nih/file.c 2009-10-03 09:37:58 +0000
767+++ nih/file.c 2013-02-28 11:39:20 +0000
768@@ -65,7 +65,7 @@
769 /* Prototypes for static functions */
770 static char **nih_dir_walk_scan (const char *path, NihFileFilter filter,
771 void *data)
772- __attribute__ ((warn_unused_result, malloc));
773+ __attribute__ ((warn_unused_result));
774 static int nih_dir_walk_visit (const char *dirname, NihList *dirs,
775 const char *path, NihFileFilter filter,
776 NihFileVisitor visitor,
777
778=== modified file 'nih/file.h'
779--- nih/file.h 2009-07-08 20:40:57 +0000
780+++ nih/file.h 2013-02-28 11:39:20 +0000
781@@ -82,7 +82,7 @@
782
783 char *nih_file_read (const void *parent, const char *path,
784 size_t *length)
785- __attribute__ ((warn_unused_result, malloc));
786+ __attribute__ ((warn_unused_result));
787
788 void *nih_file_map (const char *path, int flags, size_t *length)
789 __attribute__ ((warn_unused_result));
790
791=== modified file 'nih/hash.h'
792--- nih/hash.h 2011-01-06 09:28:39 +0000
793+++ nih/hash.h 2013-02-28 11:39:20 +0000
794@@ -203,7 +203,7 @@
795 NihKeyFunction key_function,
796 NihHashFunction hash_function,
797 NihCmpFunction cmp_function)
798- __attribute__ ((warn_unused_result, malloc));
799+ __attribute__ ((warn_unused_result));
800
801 NihList * nih_hash_add (NihHash *hash, NihList *entry);
802 NihList * nih_hash_add_unique (NihHash *hash, NihList *entry);
803
804=== modified file 'nih/io.h'
805--- nih/io.h 2009-06-23 09:29:37 +0000
806+++ nih/io.h 2013-02-28 11:39:20 +0000
807@@ -269,7 +269,7 @@
808 NihIoWatch * nih_io_add_watch (const void *parent, int fd,
809 NihIoEvents events,
810 NihIoWatcher watcher, void *data)
811- __attribute__ ((warn_unused_result, malloc));
812+ __attribute__ ((warn_unused_result));
813
814 void nih_io_select_fds (int *nfds, fd_set *readfds,
815 fd_set *writefds, fd_set *exceptfds);
816@@ -278,12 +278,12 @@
817
818
819 NihIoBuffer * nih_io_buffer_new (const void *parent)
820- __attribute__ ((warn_unused_result, malloc));
821+ __attribute__ ((warn_unused_result));
822
823 int nih_io_buffer_resize (NihIoBuffer *buffer, size_t grow);
824 char * nih_io_buffer_pop (const void *parent,
825 NihIoBuffer *buffer, size_t *len)
826- __attribute__ ((warn_unused_result, malloc));
827+ __attribute__ ((warn_unused_result));
828 void nih_io_buffer_shrink (NihIoBuffer *buffer, size_t len);
829 int nih_io_buffer_push (NihIoBuffer *buffer,
830 const char *str, size_t len)
831@@ -291,7 +291,7 @@
832
833
834 NihIoMessage *nih_io_message_new (const void *parent)
835- __attribute__ ((warn_unused_result, malloc));
836+ __attribute__ ((warn_unused_result));
837
838 int nih_io_message_add_control (NihIoMessage *message, int level,
839 int type, socklen_t len,
840@@ -300,7 +300,7 @@
841
842 NihIoMessage *nih_io_message_recv (const void *parent, int fd,
843 size_t *len)
844- __attribute__ ((warn_unused_result, malloc));
845+ __attribute__ ((warn_unused_result));
846 ssize_t nih_io_message_send (NihIoMessage *message, int fd)
847 __attribute__ ((warn_unused_result));
848
849@@ -310,7 +310,7 @@
850 NihIoCloseHandler close_handler,
851 NihIoErrorHandler error_handler,
852 void *data)
853- __attribute__ ((warn_unused_result, malloc));
854+ __attribute__ ((warn_unused_result));
855 void nih_io_shutdown (NihIo *io);
856 int nih_io_destroy (NihIo *io);
857
858@@ -319,14 +319,14 @@
859
860 char * nih_io_read (const void *parent, NihIo *io,
861 size_t *len)
862- __attribute__ ((warn_unused_result, malloc));
863+ __attribute__ ((warn_unused_result));
864 int nih_io_write (NihIo *io, const char *str,
865 size_t len)
866 __attribute__ ((warn_unused_result));
867
868 char * nih_io_get (const void *parent, NihIo *io,
869 const char *delim)
870- __attribute__ ((warn_unused_result, malloc));
871+ __attribute__ ((warn_unused_result));
872
873 int nih_io_printf (NihIo *io, const char *format, ...)
874 __attribute__ ((warn_unused_result, format (printf, 2, 3)));
875
876=== modified file 'nih/list.h'
877--- nih/list.h 2011-01-06 09:28:39 +0000
878+++ nih/list.h 2013-02-28 11:39:20 +0000
879@@ -196,10 +196,10 @@
880
881 void nih_list_init (NihList *entry);
882 NihList * nih_list_new (const void *parent)
883- __attribute__ ((warn_unused_result, malloc));
884+ __attribute__ ((warn_unused_result));
885
886 NihListEntry *nih_list_entry_new (const void *parent)
887- __attribute__ ((warn_unused_result, malloc));
888+ __attribute__ ((warn_unused_result));
889
890
891 NihList * nih_list_add (NihList *list, NihList *entry);
892
893=== modified file 'nih/main.h'
894--- nih/main.h 2009-06-23 09:29:37 +0000
895+++ nih/main.h 2013-02-28 11:39:20 +0000
896@@ -138,7 +138,7 @@
897
898 NihMainLoopFunc *nih_main_loop_add_func (const void *parent,
899 NihMainLoopCb callback, void *data)
900- __attribute__ ((warn_unused_result, malloc));
901+ __attribute__ ((warn_unused_result));
902
903 void nih_main_term_signal (void *data, NihSignal *signal);
904
905
906=== modified file 'nih/option.h'
907--- nih/option.h 2009-06-23 09:29:37 +0000
908+++ nih/option.h 2013-02-28 11:39:20 +0000
909@@ -124,11 +124,11 @@
910 char ** nih_option_parser (const void *parent,
911 int argc, char *argv[],
912 NihOption *options, int break_nonopt)
913- __attribute__ ((warn_unused_result, malloc));
914+ __attribute__ ((warn_unused_result));
915
916 NihOption *nih_option_join (const void *parent,
917 const NihOption *a, const NihOption *b)
918- __attribute__ ((warn_unused_result, malloc));
919+ __attribute__ ((warn_unused_result));
920
921 int nih_option_count (NihOption *option, const char *arg);
922 int nih_option_int (NihOption *option, const char *arg);
923
924=== modified file 'nih/signal.h'
925--- nih/signal.h 2009-06-23 09:29:37 +0000
926+++ nih/signal.h 2013-02-28 11:39:20 +0000
927@@ -76,7 +76,7 @@
928
929 NihSignal * nih_signal_add_handler (const void *parent, int signum,
930 NihSignalHandler handler, void *data)
931- __attribute__ ((warn_unused_result, malloc));
932+ __attribute__ ((warn_unused_result));
933
934 void nih_signal_handler (int signum);
935 void nih_signal_poll (void);
936
937=== modified file 'nih/string.h'
938--- nih/string.h 2009-06-23 09:29:37 +0000
939+++ nih/string.h 2013-02-28 11:39:20 +0000
940@@ -35,60 +35,60 @@
941 NIH_BEGIN_EXTERN
942
943 char * nih_sprintf (const void *parent, const char *format, ...)
944- __attribute__ ((format (printf, 2, 3), warn_unused_result, malloc));
945+ __attribute__ ((format (printf, 2, 3), warn_unused_result));
946
947 char * nih_vsprintf (const void *parent, const char *format,
948 va_list args)
949- __attribute__ ((format (printf, 2, 0), warn_unused_result, malloc));
950+ __attribute__ ((format (printf, 2, 0), warn_unused_result));
951
952 char * nih_strdup (const void *parent, const char *str)
953- __attribute__ ((warn_unused_result, malloc));
954+ __attribute__ ((warn_unused_result));
955
956 char * nih_strndup (const void *parent, const char *str, size_t len)
957- __attribute__ ((warn_unused_result, malloc));
958+ __attribute__ ((warn_unused_result));
959
960 char * nih_strcat (char **str, const void *parent, const char *src)
961- __attribute__ ((warn_unused_result, malloc));
962+ __attribute__ ((warn_unused_result));
963 char * nih_strncat (char **str, const void *parent, const char *src,
964 size_t len)
965- __attribute__ ((warn_unused_result, malloc));
966+ __attribute__ ((warn_unused_result));
967
968 char * nih_strcat_sprintf (char **str, const void *parent,
969 const char *format, ...)
970- __attribute__ ((format (printf, 3, 4), warn_unused_result, malloc));
971+ __attribute__ ((format (printf, 3, 4), warn_unused_result));
972 char * nih_strcat_vsprintf (char **str, const void *parent,
973 const char *format, va_list args)
974- __attribute__ ((format (printf, 3, 0), warn_unused_result, malloc));
975+ __attribute__ ((format (printf, 3, 0), warn_unused_result));
976
977 char **nih_str_split (const void *parent, const char *str,
978 const char *delim, int repeat)
979- __attribute__ ((warn_unused_result, malloc));
980+ __attribute__ ((warn_unused_result));
981
982 char **nih_str_array_new (const void *parent)
983- __attribute__ ((warn_unused_result, malloc));
984+ __attribute__ ((warn_unused_result));
985 char **nih_str_array_add (char ***array, const void *parent, size_t *len,
986 const char *str)
987- __attribute__ ((warn_unused_result, malloc));
988+ __attribute__ ((warn_unused_result));
989 char **nih_str_array_addn (char ***array, const void *parent, size_t *len,
990 const char *str, size_t strlen)
991- __attribute__ ((warn_unused_result, malloc));
992+ __attribute__ ((warn_unused_result));
993 char **nih_str_array_addp (char ***array, const void *parent, size_t *len,
994 void *ptr)
995- __attribute__ ((warn_unused_result, malloc));
996+ __attribute__ ((warn_unused_result));
997 char **nih_str_array_copy (const void *parent, size_t *len,
998 char * const *array)
999- __attribute__ ((warn_unused_result, malloc));
1000+ __attribute__ ((warn_unused_result));
1001 char **nih_str_array_append (char ***array, const void *parent, size_t *len,
1002 char * const *args)
1003- __attribute__ ((warn_unused_result, malloc));
1004+ __attribute__ ((warn_unused_result));
1005
1006 char * nih_str_wrap (const void *parent, const char *str, size_t len,
1007 size_t first_indent, size_t indent)
1008- __attribute__ ((warn_unused_result, malloc));
1009+ __attribute__ ((warn_unused_result));
1010 size_t nih_str_screen_width (void);
1011 char * nih_str_screen_wrap (const void *parent, const char *str,
1012 size_t first_indent, size_t indent)
1013- __attribute__ ((warn_unused_result, malloc));
1014+ __attribute__ ((warn_unused_result));
1015
1016 NIH_END_EXTERN
1017
1018
1019=== modified file 'nih/timer.h'
1020--- nih/timer.h 2009-06-23 09:29:37 +0000
1021+++ nih/timer.h 2013-02-28 11:39:20 +0000
1022@@ -59,7 +59,7 @@
1023 * @months: months (1-12),
1024 * @wdays: days of week (0-7).
1025 *
1026- * Indidcates when scheduled timers should be run, each member is a bit
1027+ * Indicates when scheduled timers should be run, each member is a bit
1028 * field where the bit is 1 if the timer should be run for that value and
1029 * 0 if not.
1030 **/
1031@@ -117,14 +117,14 @@
1032
1033 NihTimer *nih_timer_add_timeout (const void *parent, time_t timeout,
1034 NihTimerCb callback, void *data)
1035- __attribute__ ((warn_unused_result, malloc));
1036+ __attribute__ ((warn_unused_result));
1037 NihTimer *nih_timer_add_periodic (const void *parent, time_t period,
1038 NihTimerCb callback, void *data)
1039- __attribute__ ((warn_unused_result, malloc));
1040+ __attribute__ ((warn_unused_result));
1041 NihTimer *nih_timer_add_scheduled (const void *parent,
1042 NihTimerSchedule *schedule,
1043 NihTimerCb callback, void *data)
1044- __attribute__ ((warn_unused_result, malloc));
1045+ __attribute__ ((warn_unused_result));
1046
1047 NihTimer *nih_timer_next_due (void);
1048 void nih_timer_poll (void);
1049
1050=== modified file 'nih/tree.h'
1051--- nih/tree.h 2009-06-23 09:29:37 +0000
1052+++ nih/tree.h 2013-02-28 11:39:20 +0000
1053@@ -344,9 +344,9 @@
1054
1055 void nih_tree_init (NihTree *tree);
1056 NihTree * nih_tree_new (const void *parent)
1057- __attribute__ ((warn_unused_result, malloc));
1058+ __attribute__ ((warn_unused_result));
1059 NihTreeEntry *nih_tree_entry_new (const void *parent)
1060- __attribute__ ((warn_unused_result, malloc));
1061+ __attribute__ ((warn_unused_result));
1062
1063 NihTree * nih_tree_add (NihTree *tree, NihTree *node,
1064 NihTreeWhere where);
1065
1066=== modified file 'nih/watch.h'
1067--- nih/watch.h 2009-06-23 09:29:37 +0000
1068+++ nih/watch.h 2013-02-28 11:39:20 +0000
1069@@ -156,7 +156,7 @@
1070 NihCreateHandler create_handler,
1071 NihModifyHandler modify_handler,
1072 NihDeleteHandler delete_handler, void *data)
1073- __attribute__ ((warn_unused_result, malloc));
1074+ __attribute__ ((warn_unused_result));
1075
1076 int nih_watch_add (NihWatch *watch, const char *path, int subdirs)
1077 __attribute__ ((warn_unused_result));

Subscribers

People subscribed via source and target branches