← Back to branch summary

~ubuntu-branches/ubuntu/raring/libnih/raring

« back to all changes in this revision

Viewing changes to nih-dbus-tool/marshal.c

  • Committer: James Hunt
  • Date: 2013-03-14 10:27:34 UTC
  • mfrom: (1027.1.34 upstart-devel-libnih)
  • Revision ID: james.hunt@ubuntu.com-20130314102734-blit21ei3v9n0u2o
Tags: 1.0.3-4ubuntu16
https://launchpad.net/bugs/776532
https://launchpad.net/bugs/777097
https://launchpad.net/bugs/834813
https://launchpad.net/bugs/1123588
Merge of important fixes from lp:~upstart-devel/libnih/nih
(LP: #776532, LP: #777097, LP: #834813, LP: #1123588).

Show diffs side-by-side

added added

removed removed

Lines of Context:
nih-dbus-tool/marshal.c
49
49
                             const char *prefix, const char *interface_symbol,
50
50
                             const char *member_symbol, const char *symbol,
51
51
                             NihList *structs)
52
 
        __attribute__ ((warn_unused_result, malloc));
 
52
        __attribute__ ((warn_unused_result));
53
53
static char *marshal_array  (const void *parent,
54
54
                             DBusSignatureIter *iter,
55
55
                             const char *iter_name, const char *name,
58
58
                             const char *prefix, const char *interface_symbol,
59
59
                             const char *member_symbol, const char *symbol,
60
60
                             NihList *structs)
61
 
        __attribute__ ((warn_unused_result, malloc));
 
61
        __attribute__ ((warn_unused_result));
62
62
static char *marshal_struct (const void *parent,
63
63
                             DBusSignatureIter *iter,
64
64
                             const char *iter_name, const char *name,
67
67
                             const char *prefix, const char *interface_symbol,
68
68
                             const char *member_symbol, const char *symbol,
69
69
                             NihList *structs)
70
 
        __attribute__ ((warn_unused_result, malloc));
 
70
        __attribute__ ((warn_unused_result));
71
71
 
72
72
 
73
73
/**