cppcheck refactoring

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2020-08-10 20:58:34 +02:00
parent 47838a059f
commit 345fd715f5
42 changed files with 169 additions and 524 deletions

View File

@@ -5,7 +5,7 @@
#include "test.h"
struct digest_test tests[] = {
struct digest_test emls[] = {
{"1.eml", "7fa4f06f7085986007454b374f6685e4cf838d9e9f8878f3cba89cfe98e29f56", "bbbafb22e2d4c035584a5024e9d4feaf32172559b4d7cacc8b7af4bd548da53e"},
{"2.eml", "668cb3b91b944af786667323442576b9813d65f3cd3bc33e9d5da303c79de038", "de90475409dd6ab24e80c1b7a987715c40fe8d28d91337b7f063b477159c7b3c"},
{"3.eml", "0d546d4cb4a8ce74ea5fd4cc51dbb4ebeaa7542f1c691817579da7eeab8d4771", "f585d011340d292ee52ddedb07cda662a8f1e46329d14a2ce92dca0604387bab"},
@@ -41,9 +41,9 @@ static void test_digest_file(){
unsigned int i;
char digest[2*DIGEST_LENGTH+1];
for(i=0; i<sizeof(tests)/sizeof(struct digest_test); i++){
digest_file(tests[i].s, &digest[0]);
assert(strcmp(digest, tests[i].digest2) == 0 && "test_digest_file()");
for(i=0; i<sizeof(emls)/sizeof(struct digest_test); i++){
digest_file(emls[i].s, &digest[0]);
assert(strcmp(digest, emls[i].digest2) == 0 && "test_digest_file()");
}
printf("test_digest_file() OK\n");
@@ -64,8 +64,8 @@ static void test_make_digests(struct config *cfg){
}
for(i=0; i<sizeof(tests)/sizeof(struct digest_test); i++){
if(setup_and_parse_message(&sdata, &state, &data, tests[i].s, cfg) == 1){
for(i=0; i<sizeof(emls)/sizeof(struct digest_test); i++){
if(setup_and_parse_message(&sdata, &state, &data, emls[i].s, cfg) == 1){
continue;
}
@@ -79,8 +79,8 @@ static void test_make_digests(struct config *cfg){
unlink(sdata.tmpframe);
assert(strcmp(sdata.bodydigest, tests[i].digest1) == 0 && "test_make_digests()");
assert(strcmp(sdata.digest, tests[i].digest2) == 0 && "test_make_digests()");
assert(strcmp(sdata.bodydigest, emls[i].digest1) == 0 && "test_make_digests()");
assert(strcmp(sdata.digest, emls[i].digest2) == 0 && "test_make_digests()");
}

View File

@@ -123,7 +123,7 @@ static void test_create_id(){
static void test_split(){
unsigned int i;
int result;
char *p, buf[SMALLBUFSIZE];
char buf[SMALLBUFSIZE];
struct test_data_s_s_i test_data_s_s_i[] = {
{ "hello\nworld\n", "world\n", 1 },
@@ -135,7 +135,7 @@ static void test_split(){
TEST_HEADER();
for(i=0; i<sizeof(test_data_s_s_i)/sizeof(struct test_data_s_s_i); i++){
p = split(test_data_s_s_i[i].s1, '\n', buf, sizeof(buf)-1, &result);
char *p = split(test_data_s_s_i[i].s1, '\n', buf, sizeof(buf)-1, &result);
if(p){ ASSERT(strcmp(buf, "hello") == 0 && strcmp(p, test_data_s_s_i[i].s2) == 0 && result == test_data_s_s_i[i].result, test_data_s_s_i[i].s1); }
else { ASSERT(p == NULL && result == test_data_s_s_i[i].result, test_data_s_s_i[i].s1); }
@@ -147,7 +147,7 @@ static void test_split(){
static void test_split_str(){
unsigned int i;
char *p, buf[SMALLBUFSIZE];
char buf[SMALLBUFSIZE];
struct test_data_s_s test_data_s_s[] = {
{ "aaaXXbbbXX", "bbbXX" },
@@ -159,7 +159,7 @@ static void test_split_str(){
TEST_HEADER();
for(i=0; i<sizeof(test_data_s_s)/sizeof(struct test_data_s_s); i++){
p = split_str(test_data_s_s[i].s, "XX", buf, sizeof(buf)-1);
char *p = split_str(test_data_s_s[i].s, "XX", buf, sizeof(buf)-1);
if(p){ ASSERT(strcmp(buf, "aaa") == 0 && strcmp(test_data_s_s[i].result, p) == 0, test_data_s_s[i].s); }
else { ASSERT(strcmp(buf, "aaa") == 0 && p == NULL, test_data_s_s[i].s); }

View File

@@ -25,7 +25,6 @@ struct str_pair {
static void test_parse_date_header(){
unsigned int i;
struct config cfg;
time_t delta;
struct date_test date_test[] = {
{"Date: Mon, 02 Nov 2015 09:39:31 -0000", 1446457171},
{"Date: Mon, 2 Nov 2015 10:39:45 +0100", 1446457185},
@@ -49,7 +48,7 @@ static void test_parse_date_header(){
TEST_HEADER();
for(i=0; i<sizeof(date_test)/sizeof(struct date_test); i++){
delta = parse_date_header(date_test[i].date_str) - date_test[i].timestamp;
time_t delta = parse_date_header(date_test[i].date_str) - date_test[i].timestamp;
ASSERT(delta <= 3600 && delta >= -3600, date_test[i].date_str);
}

View File

@@ -27,10 +27,10 @@ void connect_to_smtp_server(char *server, int port, struct data *data){
char port_string[8], buf[MAXBUFSIZE];
struct addrinfo hints, *res;
data->net->socket = -1;
if(data == NULL) return;
data->net->socket = -1;
snprintf(port_string, sizeof(port_string)-1, "%d", port);
memset(&hints, 0, sizeof(hints));
@@ -301,7 +301,7 @@ static void test_smtp_commands_period_command_in_its_own_packet(char *server, in
int main(int argc, char **argv){
int c, port=25;
int port=25;
char *server=NULL;
struct data data;
struct net net;
@@ -325,9 +325,9 @@ int main(int argc, char **argv){
int option_index = 0;
c = getopt_long(argc, argv, "c:s:p:t:lh?", long_options, &option_index);
int c = getopt_long(argc, argv, "c:s:p:t:lh?", long_options, &option_index);
#else
c = getopt(argc, argv, "c:s:p:t:lh?");
int c = getopt(argc, argv, "c:s:p:t:lh?");
#endif