Imported Upstream version 3.3.2

[debian/amanda] / common-src / amxml.c

diff --git a/common-src/amxml.c b/common-src/amxml.c
index 7aab3f6d41f4faae4c3347b1fe958aa5a855e7ac..6f1e7a6369ab73f72cdcad05c7899120f9191928 100644 (file)
--- a/common-src/amxml.c
+++ b/common-src/amxml.c
@@ -60,7 +60,7 @@ typedef struct amgxml_s {
     property_t *property_data;
     proplist_t  property;
     script_t   *script;
-    level_t    *alevel;
+    am_level_t    *alevel;
     char       *encoding;
     char       *raw;
 } amgxml_t;
@@ -315,7 +315,7 @@ amstart_element(
        if (strcmp(element_name, "exclude") == 0 || strcmp(element_name, "include") == 0)
           data_user->has_optional = 0;
        if (strcmp(element_name, "level") == 0) {
-           data_user->alevel = g_new0(level_t, 1);
+           data_user->alevel = g_new0(am_level_t, 1);
        }
     } else if (strcmp(element_name, "server") == 0) {
        if (strcmp(last_element_name, "level") != 0) {
@@ -555,7 +555,7 @@ amtext(
     }
     last_element_name = last_element->data;
 
-    tt = malloc(text_len + 1);
+    tt = malloc(text_len + 8 + 1);
     strncpy(tt,text,text_len);
     tt[text_len] = '\0';