Rewritten most of the eurephiadm commands to use eurephiaXML_ParseResultMsg()

Commands not covered yet are users and certs commands

1 files changed, 12 insertions, 10 deletions

diff --git a/eurephiadm/commands/fwprofiles.c b/eurephiadm/commands/fwprofiles.c
index 3f79017..e864dfc 100644
--- a/eurephiadm/commands/fwprofiles.c
+++ b/eurephiadm/commands/fwprofiles.c
@@ -246,7 +246,8 @@ int list_profiles(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg,
 int addelete_profile(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int argc, char **argv)
 {
         xmlDoc *result_xml = NULL, *srch_xml = NULL;
-        xmlNode *fmap_n = NULL, *res_n = NULL, *srch_n = NULL;
+        xmlNode *fmap_n = NULL, *srch_n = NULL;
+        eurephiaRESULT *res = NULL;
         int i = 0, rc = 1, mode = 0;
 
         e_options addargs[] = {
@@ -314,20 +315,21 @@ int addelete_profile(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cf
                 return 1;
         }
 
-        res_n = eurephiaXML_getRoot(ctx, result_xml, NULL, 1);
-        if( res_n == NULL ) {
+        res = eurephiaXML_ParseResultMsg(ctx, result_xml);
+        if( res == NULL ) {
                 fprintf(stderr, "%s: Error registering firewall profiles. No results returned\n", MODULE);
                 return 1;
 
-        }
-
-        if( xmlStrcmp(res_n->name, (xmlChar *) "Error") == 0 ) {
-                fprintf(stderr, "%s: %s\n", MODULE, xmlExtractContent(res_n));
-                rc = 1;
         } else {
-                fprintf(stdout, "%s: %s\n", MODULE, xmlExtractContent(res_n));
-                rc = 0;
+                if( res->resultType == exmlERROR ) {
+                        fprintf(stderr, "%s: %s\n", MODULE, res->message);
+                        rc = 1;
+                } else {
+                        fprintf(stdout, "%s: %s\n", MODULE, res->message);
+                        rc = 0;
+                }
         }
+        free_nullsafe(ctx, res);
         xmlFreeDoc(result_xml);
 
         return rc;