From 1694e37c583b43e683b3a0cd5ac9f76e57c2d3c4 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Wed, 12 Sep 2018 01:06:36 +0200
Subject: [PATCH] More fixes to JSON API

Remove unnecessary dangerous method from RsLoginHelper
Fix documentation for RsServiceControl::getServiceName that was breaking
  JSON API and causing compilation warning
---
 libretroshare/src/retroshare/rsinit.h           | 6 ------
 libretroshare/src/retroshare/rsservicecontrol.h | 2 +-
 libretroshare/src/rsserver/rsinit.cc            | 5 -----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/libretroshare/src/retroshare/rsinit.h b/libretroshare/src/retroshare/rsinit.h
index 68e70fe65..731b111cc 100644
--- a/libretroshare/src/retroshare/rsinit.h
+++ b/libretroshare/src/retroshare/rsinit.h
@@ -284,12 +284,6 @@ struct RsLoginHelper
 	 * @return true if already logged in, false otherwise
 	 */
 	bool isLoggedIn();
-
-	/**
-	 * @brief Close RetroShare session
-	 * @jsonapi{development}
-	 */
-	void closeSession();
 };
 
 #endif
diff --git a/libretroshare/src/retroshare/rsservicecontrol.h b/libretroshare/src/retroshare/rsservicecontrol.h
index 7f9fdb5d2..726b3efb4 100644
--- a/libretroshare/src/retroshare/rsservicecontrol.h
+++ b/libretroshare/src/retroshare/rsservicecontrol.h
@@ -141,7 +141,7 @@ public:
 	/**
 	 * @brief getServiceName lookup the name of a service.
 	 * @jsonapi{development}
-	 * @param[in] service_id service to look up
+	 * @param[in] serviceId service to look up
 	 * @return name of service
 	 */
 	virtual std::string getServiceName(uint32_t serviceId) = 0;
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index d02199b3d..e334895cd 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -2014,11 +2014,6 @@ bool RsLoginHelper::isLoggedIn()
 	return RsControl::instance()->isReady();
 }
 
-void RsLoginHelper::closeSession()
-{
-	RsControl::instance()->rsGlobalShutDown();
-}
-
 void RsLoginHelper::Location::serial_process(
         RsGenericSerializer::SerializeJob j,
         RsGenericSerializer::SerializeContext& ctx )