mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-19 03:49:29 -04:00
Minor fixes
pqi/authgpg.cc: - remove French comment (with nasty non-unicode characters) - use std::cerr instead of fprintf tcponudp/extaddrfinder.cc: - initialize correctly the sockaddr_in, former code wouldn't pad sin_zero (which is required by the standard) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
91dde5b8b8
commit
e49cc6552c
2 changed files with 4 additions and 3 deletions
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
//#define GPG_DEBUG 1
|
//#define GPG_DEBUG 1
|
||||||
|
|
||||||
// initialisation du pointeur de singleton à zéro
|
// initializing the singleton pointer
|
||||||
AuthGPG *AuthGPG::instance_gpg = new AuthGPG();
|
AuthGPG *AuthGPG::instance_gpg = new AuthGPG();
|
||||||
|
|
||||||
/* Turn a set of parameters into a string */
|
/* Turn a set of parameters into a string */
|
||||||
|
@ -770,7 +770,7 @@ bool AuthGPG::DoOwnSignature_locked(const void *data, unsigned int datalen, void
|
||||||
|
|
||||||
if (len < *outl) // -1 because we added a 0 at the end.
|
if (len < *outl) // -1 because we added a 0 at the end.
|
||||||
{
|
{
|
||||||
fprintf(stderr,"Length is smaller. Reducing to %d\n",len) ;
|
std::cerr << "Length is smaller. Reducing to " << len << std::endl;
|
||||||
*outl = len;
|
*outl = len;
|
||||||
}
|
}
|
||||||
memmove(buf_sigout, export_sig, *outl);
|
memmove(buf_sigout, export_sig, *outl);
|
||||||
|
|
|
@ -53,7 +53,8 @@ static void getPage(const std::string& server_name,std::string& page)
|
||||||
{
|
{
|
||||||
page = "" ;
|
page = "" ;
|
||||||
int sockfd,n=0; // socket descriptor
|
int sockfd,n=0; // socket descriptor
|
||||||
struct sockaddr_in serveur= {0}; // server's parameters
|
struct sockaddr_in serveur; // server's parameters
|
||||||
|
memset(&serveur.sin_zero, 0, sizeof(serveur.sin_zero));
|
||||||
struct hostent *hostinfo=NULL; // structure for storing the server's ip
|
struct hostent *hostinfo=NULL; // structure for storing the server's ip
|
||||||
|
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue