Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #400 from sehraf/pr-remove-warnings

Browse Source 
remove compiler warnings in libbitdht and openpgpsdk
This commit is contained in:
Cyril Soler 2016-06-01 16:16:43 -04:00
commit 7d80160dfb
7 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libbitdht/src/bitdht/bdfilter.cc
View File

@ -46,8 +46,6 @@ bdFilter::bdFilter(const std::string &fname, const bdNodeId *ownid, uint32_t fi
mFns = fns; mFns = fns;
mFilename = fname ; mFilename = fname ;
time_t now = time(NULL) ;
loadBannedIpFile() ; loadBannedIpFile() ;
mFilterFlags = filterFlags; mFilterFlags = filterFlags;
@ -92,8 +90,6 @@ void bdFilter::loadBannedIpFile()
memset(&addr, 0, sizeof(struct sockaddr_in)); memset(&addr, 0, sizeof(struct sockaddr_in));
addr.sin_family = PF_INET; addr.sin_family = PF_INET;
unsigned short port;
FILE *fd = fopen(mFilename.c_str(),"r") ; FILE *fd = fopen(mFilename.c_str(),"r") ;
if(fd == NULL) if(fd == NULL)

2
libbitdht/src/bitdht/bdpeer.cc
View File

@ -344,6 +344,8 @@ int bdSpace::find_node(const bdNodeId *id, int number, std::list<bdId> &matchIds
std::cerr << " Number: " << number; std::cerr << " Number: " << number;
std::cerr << " Bucket #: " << buckno; std::cerr << " Bucket #: " << buckno;
std::cerr << std::endl; std::cerr << std::endl;
#else
(void)number;
#endif #endif
bdBucket &buck = buckets[buckno]; bdBucket &buck = buckets[buckno];

4
openpgpsdk/src/openpgpsdk/create.c
View File

@ -509,7 +509,7 @@ ops_boolean_t ops_write_transferable_public_key_from_packet_data(const ops_keyda
ops_create_info_t *info) ops_create_info_t *info)
{ {
ops_boolean_t rtn = ops_true; ops_boolean_t rtn = ops_true;
unsigned int i=0,j=0; unsigned int i=0;
if (armoured) if (armoured)
{ ops_writer_push_armoured(info, OPS_PGP_PUBLIC_KEY_BLOCK); } { ops_writer_push_armoured(info, OPS_PGP_PUBLIC_KEY_BLOCK); }
@ -532,7 +532,7 @@ ops_boolean_t ops_write_transferable_secret_key_from_packet_data(const ops_keyda
ops_create_info_t *info) ops_create_info_t *info)
{ {
ops_boolean_t rtn = ops_true; ops_boolean_t rtn = ops_true;
unsigned int i=0,j=0; unsigned int i=0;
if(keydata->type != OPS_PTAG_CT_ENCRYPTED_SECRET_KEY) if(keydata->type != OPS_PTAG_CT_ENCRYPTED_SECRET_KEY)
{ {

6
openpgpsdk/src/openpgpsdk/crypto.c
View File

@ -309,11 +309,6 @@ ops_boolean_t ops_decrypt_memory(const unsigned char *encrypted_memory,int em_le
const ops_boolean_t use_armour, const ops_boolean_t use_armour,
ops_parse_cb_t* cb_get_passphrase) ops_parse_cb_t* cb_get_passphrase)
{ {
int fd_in=0;
int fd_out=0;
char* myfilename=NULL;
//
ops_parse_info_t *pinfo=NULL; ops_parse_info_t *pinfo=NULL;
// setup for reading from given input file // setup for reading from given input file
@ -368,7 +363,6 @@ ops_boolean_t ops_decrypt_memory(const unsigned char *encrypted_memory,int em_le
*decrypted_memory = ops_mallocz(*out_length) ; *decrypted_memory = ops_mallocz(*out_length) ;
memcpy(*decrypted_memory,ops_memory_get_data(output_mem),*out_length) ; memcpy(*decrypted_memory,ops_memory_get_data(output_mem),*out_length) ;
ops_decrypt_memory_ABORT:
ops_teardown_memory_write(pinfo->cbinfo.cinfo, output_mem); ops_teardown_memory_write(pinfo->cbinfo.cinfo, output_mem);
ops_teardown_memory_read(pinfo, input_mem); ops_teardown_memory_read(pinfo, input_mem);

2
openpgpsdk/src/openpgpsdk/keyring.c
View File

@ -616,8 +616,6 @@ ops_boolean_t ops_add_selfsigned_userid_to_keydata(ops_keydata_t* keydata, ops_u
ops_boolean_t ops_sign_key(ops_keydata_t* keydata, const unsigned char *signers_key_id,ops_secret_key_t *signers_key) ops_boolean_t ops_sign_key(ops_keydata_t* keydata, const unsigned char *signers_key_id,ops_secret_key_t *signers_key)
{ {
/* ops_memory_t* mem_userid=NULL; */ /* ops_memory_t* mem_userid=NULL; */
ops_create_info_t* cinfo_userid=NULL;
ops_memory_t* mem_sig=NULL; ops_memory_t* mem_sig=NULL;
ops_create_info_t* cinfo_sig=NULL; ops_create_info_t* cinfo_sig=NULL;

2
openpgpsdk/src/openpgpsdk/packet-print.c
View File

@ -998,7 +998,7 @@ int ops_print_packet(const ops_parser_content_t *content_)
case OPS_PTAG_SS_EMBEDDED_SIGNATURE: case OPS_PTAG_SS_EMBEDDED_SIGNATURE:
start_subpacket(content_->tag); start_subpacket(content_->tag);
end_subpacket(content_->tag); // \todo print out contents? end_subpacket(); // \todo print out contents?
break; break;
case OPS_PTAG_SS_USERDEFINED00: case OPS_PTAG_SS_USERDEFINED00:

2
openpgpsdk/src/openpgpsdk/util.c
View File

@ -118,7 +118,7 @@ void *ops_mallocz(size_t n)
void *m=malloc(n); void *m=malloc(n);
if(m == NULL) if(m == NULL)
fprintf(stderr,"(EE) Cannot allocate %d bytes of memory in %s\n",n,__PRETTY_FUNCTION__) ; fprintf(stderr,"(EE) Cannot allocate %lu bytes of memory in %s\n",n,__PRETTY_FUNCTION__) ;
else else
memset(m,'\0',n); memset(m,'\0',n);