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

removed one assert in ops

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-12-02 19:45:25 +00:00
parent 7d0d51dc2a
commit d0d85c0242
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openpgpsdk/src/openpgpsdk/accumulate.c
View File

@ -29,7 +29,6 @@
#include "keyring_local.h" #include "keyring_local.h"
#include "parse_local.h" #include "parse_local.h"
#include <openpgpsdk/signature.h> #include <openpgpsdk/signature.h>
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -88,7 +87,6 @@ static ops_parse_cb_return_t accumulate_cb(const ops_parser_content_t *content_,
OPS_ERROR(cbinfo->errors,OPS_E_P_NO_USERID, "No user id found"); OPS_ERROR(cbinfo->errors,OPS_E_P_NO_USERID, "No user id found");
return OPS_KEEP_MEMORY; return OPS_KEEP_MEMORY;
} }
// assert(cur);
ops_add_userid_to_keydata(cur, &content->user_id); ops_add_userid_to_keydata(cur, &content->user_id);
free(content->user_id.user_id); free(content->user_id.user_id);
return OPS_KEEP_MEMORY; return OPS_KEEP_MEMORY;
@ -102,7 +100,6 @@ static ops_parse_cb_return_t accumulate_cb(const ops_parser_content_t *content_,
case OPS_PARSER_ERROR: case OPS_PARSER_ERROR:
fprintf(stderr,"Error: %s\n",content->error.error); fprintf(stderr,"Error: %s\n",content->error.error);
//assert(0);
break; break;
case OPS_PARSER_ERRCODE: case OPS_PARSER_ERRCODE:
@ -110,7 +107,6 @@ static ops_parse_cb_return_t accumulate_cb(const ops_parser_content_t *content_,
{ {
default: default:
fprintf(stderr,"parse error: %s\n", ops_errcode(content->errcode.errcode)); fprintf(stderr,"parse error: %s\n", ops_errcode(content->errcode.errcode));
//assert(0);
} }
break; break;
@ -141,7 +137,12 @@ int ops_parse_and_accumulate(ops_keyring_t *keyring,
accumulate_arg_t arg; accumulate_arg_t arg;
assert(!parse_info->rinfo.accumulate); if(parse_info->rinfo.accumulate)
{
fprintf(stderr,"Structural error: parse_info->rinfo.accumulate should be ops_false" ) ;
return 0 ; // error
}
//assert(!parse_info->rinfo.accumulate);
memset(&arg,'\0',sizeof arg); memset(&arg,'\0',sizeof arg);