Port: Remove _GNU_SOURCE, defined in config.h

[lttng-tools.git] / src / common / config / config.c

diff --git a/src/common/config/config.c b/src/common/config/config.c
index 03601be486deacc189f260251108534156aa0c1c..5e5a8d58e0c2ce229f2c724f931898a3a05c81cb 100644 (file)
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <ctype.h>
@@ -340,11 +339,10 @@ static xmlChar *encode_string(const char *in_str)
 
        in_len = strlen(in_str);
        /*
-        * Add 1 byte for the NULL terminted character. The factor 2 here is
-        * because UTF-8 can be on two bytes so this fits the worst case for each
-        * bytes.
+        * Add 1 byte for the NULL terminted character. The factor 4 here is
+        * used because UTF-8 characters can take up to 4 bytes.
         */
-       out_len = (in_len * 2) + 1;
+       out_len = (in_len * 4) + 1;
        out_str = xmlMalloc(out_len);
        if (!out_str) {
                goto end;
@@ -1428,6 +1426,26 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 
        memset(&event, 0, sizeof(event));
 
+       /* Initialize default log level which varies by domain */
+       switch (handle->domain.type)
+       {
+       case LTTNG_DOMAIN_JUL:
+               event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+               break;
+       case LTTNG_DOMAIN_LOG4J:
+               event.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL;
+               break;
+       case LTTNG_DOMAIN_PYTHON:
+               event.loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG;
+               break;
+       case LTTNG_DOMAIN_UST:
+       case LTTNG_DOMAIN_KERNEL:
+               event.loglevel = LTTNG_LOGLEVEL_DEBUG;
+               break;
+       default:
+               assert(0);
+       }
+
        for (node = xmlFirstElementChild(event_node); node;
                node = xmlNextElementSibling(node)) {
                if (!strcmp((const char *) node->name, config_element_name)) {
@@ -2096,7 +2114,7 @@ static
 int process_pid_tracker_node(xmlNodePtr pid_tracker_node,
        struct lttng_handle *handle)
 {
-       int ret, child;
+       int ret = 0, child;
        xmlNodePtr targets_node = NULL;
        xmlNodePtr node;