-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Danny,
I've merged your patch. Thanks! It's now upstream and in stable-2.0 :). Just a note for the next time. This is a "Fix" patch so in the commit message, start with "Fix:". I've changed it for you for this commit. Only commit with Fix: are picked for the stable-2.0 branch. commit eacaa7a62c3f2b9a019fd145d69c977fc53144bb Author: Danny Serres <[email protected]> Date: Wed Jun 6 14:54:30 2012 -0400 Fix: move memset in channel_set_attr after NULL check Signed-off-by: Danny Serres <[email protected]> Signed-off-by: David Goulet <[email protected]> Cheers! David On 06/06/12 02:54 PM, Danny Serres wrote: > Signed-off-by: Danny Serres <[email protected]> --- > src/lib/lttng-ctl/lttng-ctl.c | 4 ++-- 1 file changed, 2 insertions(+), > 2 deletions(-) > > diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c > index 36069ef..356fb34 100644 --- a/src/lib/lttng-ctl/lttng-ctl.c +++ > b/src/lib/lttng-ctl/lttng-ctl.c @@ -885,13 +885,13 @@ int > lttng_calibrate(struct lttng_handle *handle, void > lttng_channel_set_default_attr(struct lttng_domain *domain, struct > lttng_channel_attr *attr) { - memset(attr, 0, sizeof(struct > lttng_channel_attr)); - /* Safety check */ if (attr == NULL || domain == > NULL) { return; } > > + memset(attr, 0, sizeof(struct lttng_channel_attr)); + switch > (domain->type) { case LTTNG_DOMAIN_KERNEL: attr->overwrite = > DEFAULT_CHANNEL_OVERWRITE; -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAEBAgAGBQJP0N9dAAoJEELoaioR9I02N3gH/3y9buoeohXbFW3YgF+ACTov Tzon+vqwglgYDBd6xCtxzNUxvMR/UdTeuOr8V6RYTApHEXzgM3viLlpLFjB5YR01 qHBCl5mpp7hRHE/VAWIS4wJfg1lBeR+m+dAg+FB0SZKxm/3FiLzkltI3IQlmi6zH qpNPXYfpEPm5Z6TmW0S+4P8qryVSkXO8OmM16NydXq3w6TOPmVkaqgYemNs2brAR pmcw9ab9OMxqhZwL3ZG39SbMxstqhZy6qlMo6OM87uoVzVh52OUFspkemmk7O2vv 2/RZVp+5b0NgA5I1QwAXB3uU6AXv+Ld+dbSg9KosppvfFAQWieCMcaElnORt63M= =LClK -----END PGP SIGNATURE----- _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
