Cluster Project branch, master, updated. cluster-2.99.02-21-gd694f90

Cluster Project branch, master, updated. cluster-2.99.02-21-gd694f90

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d694f90bbccd99d8403ee0b796834684bbd04508

The branch, master has been updated
       via  d694f90bbccd99d8403ee0b796834684bbd04508 (commit)
      from  b97ae81d1aa7ae7be15f02852bd21184b9e2570f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d694f90bbccd99d8403ee0b796834684bbd04508
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Thu May 22 16:43:27 2008 +0200

    [CCS] Use absolute path for queries
    
    * It is more efficient
    * It is a well-defined location
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 ccs/ccs_tool/update.c |    6 +++---
 ccs/daemon/misc.c     |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ccs/ccs_tool/update.c b/ccs/ccs_tool/update.c
index 2009b90..2995d3d 100644
--- a/ccs/ccs_tool/update.c
+++ b/ccs/ccs_tool/update.c
@@ -67,7 +67,7 @@ static int get_doc_version(xmlDocPtr ldoc)
     goto fail;
   }
 
-  obj = xmlXPathEvalExpression((xmlChar *)"//cluster/@config_version", ctx);
+  obj = xmlXPathEvalExpression((xmlChar *)"/cluster/@config_version", ctx);
 
   if (!obj || !obj->nodesetval || (obj->nodesetval->nodeNr != 1)) {
     fprintf(stderr, "Error while retrieving config_version.\n");
@@ -150,7 +150,7 @@ int update(char *location)
     return desc;
   }
 
-  if ((error = ccs_get(desc, "//@config_version", &v1_str))) {
+  if ((error = ccs_get(desc, "/cluster/@config_version", &v1_str))) {
     fprintf(stderr, "Unable to get current config_version: %s\n", strerror(-error));
     ccs_disconnect(desc);
     return error;
@@ -355,7 +355,7 @@ int update(char *location)
     return 0;
   }
 
-  if ((error = ccs_get(desc, "//@config_version", &v3_str))) {
+  if ((error = ccs_get(desc, "/cluster/@config_version", &v3_str))) {
     ccs_disconnect(desc);
     return 0;
   }
diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c
index bfc8612..3bb90c7 100644
--- a/ccs/daemon/misc.c
+++ b/ccs/daemon/misc.c
@@ -59,7 +59,7 @@ int get_doc_version(xmlDocPtr ldoc){
     goto fail;
   }
 
-  obj = xmlXPathEvalExpression((xmlChar *)"//cluster/@config_version", ctx);
+  obj = xmlXPathEvalExpression((xmlChar *)"/cluster/@config_version", ctx);
   if(!obj || !obj->nodesetval || (obj->nodesetval->nodeNr != 1)){
     log_printf(LOG_ERR, "Error while retrieving config_version.\n");
     error = -ENODATA;
@@ -125,7 +125,7 @@ char *get_cluster_name(xmlDocPtr ldoc){
     goto fail;
   }
 
-  obj = xmlXPathEvalExpression((xmlChar *)"//cluster/@name", ctx);
+  obj = xmlXPathEvalExpression((xmlChar *)"/cluster/@name", ctx);
   if(!obj || !obj->nodesetval || (obj->nodesetval->nodeNr != 1)){
     log_printf(LOG_ERR, "Error while retrieving config_version.\n");
     error = -ENODATA;
@@ -180,7 +180,7 @@ int set_ccs_logging(xmlDocPtr ldoc){
     return -1;
   }
 
-  obj = xmlXPathEvalExpression((xmlChar *)"//cluster/ccs/@log_facility", ctx);
+  obj = xmlXPathEvalExpression((xmlChar *)"/cluster/ccs/@log_facility", ctx);
   if(!obj || !obj->nodesetval || (obj->nodesetval->nodeNr != 1)){
     log_printf(LOG_DEBUG, "Error while retrieving log_facility.\n");
   } else {
@@ -209,7 +209,7 @@ int set_ccs_logging(xmlDocPtr ldoc){
     obj = NULL;
   }
 
-  obj = xmlXPathEvalExpression((xmlChar *)"//cluster/ccs/@log_level", ctx);
+  obj = xmlXPathEvalExpression((xmlChar *)"/cluster/ccs/@log_level", ctx);
   if(!obj || !obj->nodesetval || (obj->nodesetval->nodeNr != 1)){
     log_printf(LOG_DEBUG, "Error while retrieving log_level.\n");
   } else {


hooks/post-receive
--
Cluster Project