[myserver-commit] [SCM] GNU MyServer branch, master, updated. e779f1c15026dd805f2660ec6cb01304a7c164b4

[Giuseppe Scrivano]

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 "GNU MyServer".

The branch, master has been updated
       via  e779f1c15026dd805f2660ec6cb01304a7c164b4 (commit)
       via  5f3db6d1ed6ad7b158195d087585b57f0b4e7919 (commit)
      from  768e3dd337ecc8b4449a774efc7ae7e161054af6 (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 e779f1c15026dd805f2660ec6cb01304a7c164b4
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Oct 4 15:01:56 2009 +0200

    Change macro quoting style.

diff --git a/myserver/m4/python.m4 b/myserver/m4/python.m4
index 7f890b2..1b38a78 100644
--- a/myserver/m4/python.m4
+++ b/myserver/m4/python.m4
@@ -27,38 +27,38 @@ AC_DEFUN([AM_PYTHON],
     AC_MSG_RESULT(no)
     no_python=yes
   else
-    python_major_version=`echo $python_version | \
-        sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    python_minor_version=`echo $python_version | \
-        sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    python_micro_version=`echo $python_version | \
-        sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    python_major_version=$(echo $python_version | \
+        sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/')
+    python_minor_version=$(echo $python_version | \
+        sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/')
+    python_micro_version=$(echo $python_version | \
+        sed 's/Python \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/')
 
-    python_major_min=`echo $python_version_min | \
-        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    python_major_min=$(echo $python_version_min | \
+        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/')
     if test "x${python_major_min}" = "x" ; then
       python_major_min=0
     fi
   
-    python_minor_min=`echo $python_version_min | \
-        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    python_minor_min=$(echo $python_version_min | \
+        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/')
     if test "x${python_minor_min}" = "x" ; then
       python_minor_min=0
     fi
   
-    python_micro_min=`echo $python_version_min | \
-        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    python_micro_min=$(echo $python_version_min | \
+        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/')
     if test "x${python_micro_min}" = "x" ; then
       python_micro_min=0
     fi
 
-    python_version_proper=`expr \
+    python_version_proper=$(expr \
         $python_major_version \> $python_major_min \| \
         $python_major_version \= $python_major_min \& \
         $python_minor_version \> $python_minor_min \| \
         $python_major_version \= $python_major_min \& \
         $python_minor_version \= $python_minor_min \& \
-        $python_micro_version \>= $python_micro_min `
+        $python_micro_version \>= $python_micro_min)
 
     if test "$python_version_proper" = "1" ; then
       
AC_MSG_RESULT([$python_major_version.$python_minor_version.$python_micro_version])



commit 5f3db6d1ed6ad7b158195d087585b57f0b4e7919
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Oct 4 13:31:10 2009 +0200

    Change return type from `char*' to `const char*'.

diff --git a/myserver/include/base/xml/xml_parser.h 
b/myserver/include/base/xml/xml_parser.h
index d0cbf08..77a038f 100644
--- a/myserver/include/base/xml/xml_parser.h
+++ b/myserver/include/base/xml/xml_parser.h
@@ -41,9 +41,9 @@ class XmlXPathResult
 {
 public:
   XmlXPathResult (xmlXPathObjectPtr obj){xpathObj = obj;}
-  ~XmlXPathResult (){if (xpathObj)xmlXPathFreeObject (xpathObj);}
-  xmlXPathObjectPtr getObject (){return xpathObj;}
-  xmlNodeSetPtr getNodeSet (){return (xpathObj ? xpathObj->nodesetval : NULL);}
+  ~XmlXPathResult (){if (xpathObj) xmlXPathFreeObject (xpathObj);}
+  const xmlXPathObjectPtr getObject (){return xpathObj;}
+  const xmlNodeSetPtr getNodeSet (){return (xpathObj ? xpathObj->nodesetval : 
NULL);}
 private:
   xmlXPathObjectPtr xpathObj;
 };
@@ -63,9 +63,9 @@ public:
   int open (string const &filename, bool useXpath = 0){return open 
(filename.c_str (), useXpath);};
   int openMemBuf (MemBuf &, bool useXpath = 0);
 
-  char *getValue (const char* field);
-  char *getValue (string const &field){return getValue (field.c_str ());};
-  char *getAttr (const char* field, const char *attr);
+  const char *getValue (const char* field);
+  const char *getValue (string const &field){return getValue (field.c_str 
());};
+  const char *getAttr (const char* field, const char *attr);
   int setValue (const char* field, const char *value);
   int close ();
 
diff --git a/myserver/include/conf/main/main_configuration.h 
b/myserver/include/conf/main/main_configuration.h
index 553be84..4cd20a0 100644
--- a/myserver/include/conf/main/main_configuration.h
+++ b/myserver/include/conf/main/main_configuration.h
@@ -20,7 +20,8 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 # define MAIN_CONFIGURATION_H
 
 # include "stdafx.h"
-#include <string>
+# include <string>
+
 using namespace std;
 
 /*! Define the interface to read from the main configuration file.  */
@@ -29,8 +30,8 @@ class MainConfiguration
 public:
   MainConfiguration ();
   virtual ~MainConfiguration ();
-  virtual char *getValue (const char* field) = 0;
-  virtual char *getValue (string const &field);
+  virtual const char *getValue (const char* field) = 0;
+  virtual const char *getValue (string const &field);
   virtual int close ()
   {
     return 0;
diff --git a/myserver/include/conf/main/xml_main_configuration.h 
b/myserver/include/conf/main/xml_main_configuration.h
index 2eb30f2..8ff9941 100644
--- a/myserver/include/conf/main/xml_main_configuration.h
+++ b/myserver/include/conf/main/xml_main_configuration.h
@@ -40,12 +40,12 @@ public:
     return open (filename.c_str ());
   };
 
-  virtual char *getValue (const char* field)
+  virtual const char *getValue (const char* field)
   {
     return xmlParser.getValue (field);
   }
 
-  virtual char *getValue (string const &field)
+  virtual const char *getValue (string const &field)
   {
     return getValue (field.c_str ());
   };
diff --git a/myserver/src/base/xml/xml_parser.cpp 
b/myserver/src/base/xml/xml_parser.cpp
index fcee23f..f64e3b2 100644
--- a/myserver/src/base/xml/xml_parser.cpp
+++ b/myserver/src/base/xml/xml_parser.cpp
@@ -214,7 +214,7 @@ xmlDocPtr XmlParser::getDoc ()
  * \param vName vName of the root child elment
  * \return Returns the value of the vName
  */
-char *XmlParser::getValue (const char* vName)
+const char *XmlParser::getValue (const char* vName)
 {
   char *ret = NULL;
   xmlNodePtr lcur;
@@ -274,7 +274,7 @@ int XmlParser::setValue (const char* vName, const char 
*value)
  * \param attr Attribute
  * \return
  */
-char *XmlParser::getAttr (const char* field, const char *attr)
+const char *XmlParser::getAttr (const char* field, const char *attr)
 {
   xmlNodePtr lcur = cur->xmlChildrenNode;
 
diff --git a/myserver/src/conf/main/main_configuration.cpp 
b/myserver/src/conf/main/main_configuration.cpp
index b8a44b6..73561e7 100644
--- a/myserver/src/conf/main/main_configuration.cpp
+++ b/myserver/src/conf/main/main_configuration.cpp
@@ -28,7 +28,7 @@ MainConfiguration::~MainConfiguration ()
 
 }
 
-char *MainConfiguration::getValue (string const &field)
+const char *MainConfiguration::getValue (string const &field)
 {
   return getValue (field.c_str ());
 };

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

Summary of changes:
 myserver/include/base/xml/xml_parser.h             |   12 ++++----
 myserver/include/conf/main/main_configuration.h    |    7 +++--
 .../include/conf/main/xml_main_configuration.h     |    4 +-
 myserver/m4/python.m4                              |   28 ++++++++++----------
 myserver/src/base/xml/xml_parser.cpp               |    4 +-
 myserver/src/conf/main/main_configuration.cpp      |    2 +-
 6 files changed, 29 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
GNU MyServer