Merge pull request #1 from italiangrid/develop

StoRM 1.11.3 release

.gitignore

@@ -0,0 +1,3 @@
+/.project
+/.cproject
+/.settings/

bootstrap

@@ -14,12 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-mkdir -p src/autogen project rpm/tmp
+mkdir -p src/autogen project
 set -x
-
-aclocal -I m4
-
-libtoolize --force
-autoheader
-automake --foreign --add-missing --copy
-autoconf
+autoreconf -i -f 

configure.ac

@@ -17,20 +17,14 @@
 #
 
 AC_PREREQ([2.59])
-AC_INIT([storm srm client], [1.6.0])
+AC_INIT([storm srm client], [1.6.1])
 AC_CONFIG_AUX_DIR([./project])
 AC_CONFIG_SRCDIR([src/clientSRM.cpp])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 
-# Release number
-osdist=`cat /etc/redhat-release | awk 'BEGIN {FS="release "} {print $2}'| awk 'BEGIN {FS="."} {print $1}'`
-AC_SUBST([STORM_CLIENT_SO], [sl$osdist])
-AC_SUBST([STORM_CLIENT_AGE_NUMBER], [7])
-
 # Notices.
 AC_COPYRIGHT([See LICENCE file for details])
-AC_REVISION([$Revision: $])
 
 #Environment.
 WORKDIR=`pwd`
@@ -94,7 +88,6 @@ AC_CHECK_FUNC(wctomb,          [AC_DEFINE(HAVE_WCTOMB)])
 AC_CHECK_FUNC(timegm,          [AC_DEFINE(HAVE_TIMEGM)])
 #:END
 
-#AC_CHECK_FUNCS([random gettimeofday ftime localtime_r timegm gmtime gmtime_r memset select socket strchr strerror strrchr strstr strtol strtoul strtoll strtoull strtold strtod strtof strtold_l strtod_l strtof_l sscanf sscanf_l sprintf_l wctomb mbtowc getenv])
 AC_CHECK_FUNCS([memmove memset mkdir putenv rmdir strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol])
 
 AC_SUBST([STORM_CLIENT_ARCH], [$host_cpu])
@@ -141,19 +134,14 @@ AC_GLOBUS([], have_globus=yes, have_globus=no)
 AC_MSG_RESULT(["GLOBUS found $have_globus"])
 
 AC_VOMS([])
-
 AC_CGSI_GSOAP([])
 AC_GSOAP([])
 
-# Configuration items
 AM_CONFIG_HEADER([src/autogen/config.h])
-
 AC_CONFIG_FILES([Makefile])
 
 AC_CONFIG_FILES([wsdl/Makefile])
 AC_CONFIG_FILES([src/clients_version.h])
 AC_CONFIG_FILES([src/Makefile])
-AC_CONFIG_FILES([storm-client.spec])
 
 AC_OUTPUT
-

src/SRM_Client_Common.hpp

@@ -158,7 +158,6 @@ class SRM_Client_Common : public virtual SRM_Service {
     {
         int prev_index;
         char opt;
-        bool invalidOption;
 
         if (!(_parse_error_explanation.empty()))
 			_parse_error_explanation.clear();
@@ -179,10 +178,10 @@ class SRM_Client_Common : public virtual SRM_Service {
                 }
             }
         }
-        catch (PrintUsage) {
+        catch (PrintUsage&) {
             return PRINT_USAGE;
         }
-        catch (InvalidOption e) {
+        catch (InvalidOption& e) {
             _parse_error_explanation = e.getExplanation();
             return PARSE_FAILURE;
         }
@@ -252,11 +251,7 @@ class SRM_Client_Common : public virtual SRM_Service {
                 	print_Data(2, NULL, _request_SRMStatus);
                 break;
             default:
-                cout << "gSoap code: " << _soap.error << endl << endl;
-                cout << "soap_print_fault:\n";
-                soap_print_fault(&_soap, stdout);
-                cout << "\n\nsoap_print_fault_location:\n";
-                soap_print_fault_location(&_soap, stdout);
+            	cout << endl << "ERROR: " << _soap.fault->faultstring << endl;
         }
     }
 
@@ -2203,7 +2198,7 @@ class SRM_Client_Common : public virtual SRM_Service {
      */
     int tokenize(string& str, vector<string>* tokens, char separator, int minSize =0)
     {
-    	int start, end, size;
+    	size_t start, end, size;
 
     	start = end = 0;
     	while (end < str.length()) {

src/clients_version.h.in

@@ -15,6 +15,6 @@
  *
  */
 
-static const char* clients_version = "@VERSION@-@STORM_CLIENT_AGE_NUMBER@";
+static const char* clients_version = "@VERSION@";
 
 #endif /* _CLIENTS_VERSION_H */