From 810481c8b79f34a7583784825688aeaf99c15ae8 Mon Sep 17 00:00:00 2001 From: joss17 Date: Thu, 14 Jan 2010 00:37:15 +0000 Subject: [PATCH] add more explicit param names git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2032 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/rsiface/rspeers.h | 8 ++++---- libretroshare/src/rsserver/p3peers.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libretroshare/src/rsiface/rspeers.h b/libretroshare/src/rsiface/rspeers.h index 267d213cb..669070b1f 100644 --- a/libretroshare/src/rsiface/rspeers.h +++ b/libretroshare/src/rsiface/rspeers.h @@ -153,13 +153,13 @@ virtual bool getGPGSignedList(std::list &gpg_ids) = 0;//friend virtual bool getGPGValidList(std::list &gpg_ids) = 0; virtual bool getGPGAllList(std::list &gpg_ids) = 0; virtual bool getGPGDetails(std::string gpg_id, RsPeerDetails &d) = 0; -virtual bool getSSLChildListOfGPGId(std::string gpg_id, std::list &ids) = 0; +virtual bool getSSLChildListOfGPGId(std::string gpg_id, std::list &ssl_ids) = 0; /* Add/Remove Friends */ virtual bool addFriend(std::string ssl_id, std::string gpg_id) = 0; virtual bool addDummyFriend(std::string gpg_id) = 0; //we want to add a empty ssl friend for this gpg id virtual bool isDummyFriend(std::string ssl_id) = 0; -virtual bool removeFriend(std::string id) = 0; +virtual bool removeFriend(std::string ssl_or_gpg_id) = 0; /* Network Stuff */ virtual bool connectAttempt(std::string ssl_id) = 0; @@ -178,8 +178,8 @@ virtual bool getAllowTunnelConnection() = 0 ; /* Auth Stuff */ virtual std::string GetRetroshareInvite() = 0; -virtual bool loadCertificateFromFile(std::string fname, std::string &id, std::string &gpg_id) = 0; -virtual bool loadDetailsFromStringCert(std::string cert, RsPeerDetails &pd) = 0; +virtual bool loadCertificateFromFile(std::string fname, std::string &ssl_id, std::string &gpg_id) = 0; +virtual bool loadDetailsFromStringCert(std::string certGPG, RsPeerDetails &pd) = 0; virtual bool saveCertificateToFile(std::string id, std::string fname) = 0; virtual std::string saveCertificateToString(std::string id) = 0; diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc index 0846b40fa..246b0f0c9 100644 --- a/libretroshare/src/rsserver/p3peers.cc +++ b/libretroshare/src/rsserver/p3peers.cc @@ -634,7 +634,7 @@ bool p3Peers::isDummyFriend(std::string ssl_id) { return ret; } -bool p3Peers::removeFriend(std::string id) +bool p3Peers::removeFriend(std::string ssl_or_gpgid) { #ifdef P3PEERS_DEBUG std::cerr << "p3Peers::removeFriend() " << id;