merged upstream/master

libretroshare/src/libretroshare.pro

@@ -225,7 +225,7 @@ version_detail_bash_script {
     linux-* {
         QMAKE_EXTRA_TARGETS += write_version_detail
         PRE_TARGETDEPS = write_version_detail
-        write_version_detail.commands = ./version_detail.sh
+        write_version_detail.commands = $$PWD/version_detail.sh
     }
     win32 {
         QMAKE_EXTRA_TARGETS += write_version_detail
@@ -298,7 +298,7 @@ mac {
                 DEFINES *= MINIUPNPC_VERSION=13
 
 		CONFIG += upnp_miniupnpc
-		CONFIG += c+11
+                CONFIG += c++11
 
 		# zeroconf disabled at the end of libretroshare.pro (but need the code)
 		#CONFIG += zeroconf

libretroshare/src/serialiser/rsserial.h

@@ -178,32 +178,21 @@ std::ostream &printIndent(std::ostream &out, uint16_t indent);
 
 class RsRawItem: public RsItem
 {
-	public:
-		RsRawItem(uint32_t t, uint32_t size)
-			:RsItem(t), len(size)
-		{ 
-			data = rs_malloc(len);
-		}
+public:
+	RsRawItem(uint32_t t, uint32_t size) : RsItem(t), len(size)
+	{ data = rs_malloc(len); }
+	virtual ~RsRawItem() { free(data); }
 
-		virtual ~RsRawItem()
-		{
-			if (data)
-				free(data);
-			data = NULL;
-			len = 0;
-		}
+	uint32_t getRawLength() { return len; }
+	void * getRawData() { return data; }
 
-		uint32_t	getRawLength() { return len; }
-		void  *getRawData() { return data; }
+	virtual void clear() {}
+	virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
 
-		virtual void clear() { return; } /* what can it do? */
-		virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
-
-	private:
-		void *data;
-		uint32_t len;
+private:
+	void *data;
+	uint32_t len;
 };
 
 
-
 #endif /* RS_BASE_SERIALISER_H */

libretroshare/src/version_detail.sh

@@ -3,6 +3,8 @@
 #don't exit even if a command fails
 set +e
 
+pushd $(dirname "$0")
+
 SCRIPT_PATH=$(dirname "`readlink -f "${0}"`")
 
 OLDLANG=${LANG}
@@ -32,5 +34,8 @@ if [[ ${version} != '' ]]; then
 fi
 
 export LANG=${OLDLANG}
+
+popd
+
 echo "script version_detail.sh finished normally"
 exit 0