Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fuse ARM and 32bit checks as they are identical 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2022-04-24 09:00:55 +02:00
parent cb03a7e85c
commit 20fc2677e8
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dnsmasq_interface.c
View File

@ -3345,19 +3345,19 @@ static void _query_set_dnssec(queriesData *query, const enum dnssec_status dnsse
int check_struct_sizes(void)
{
int result = 0;
result += check_one_struct("ConfigStruct", sizeof(ConfigStruct), 112, 104, 104);
result += check_one_struct("queriesData", sizeof(queriesData), 56, 44, 44);
result += check_one_struct("upstreamsData", sizeof(upstreamsData), 640, 624, 624);
result += check_one_struct("clientsData", sizeof(clientsData), 696, 668, 668);
result += check_one_struct("domainsData", sizeof(domainsData), 24, 20, 20);
result += check_one_struct("DNSCacheData", sizeof(DNSCacheData), 16, 16, 16);
result += check_one_struct("ednsData", sizeof(ednsData), 72, 72, 72);
result += check_one_struct("overTimeData", sizeof(overTimeData), 32, 24, 24);
result += check_one_struct("regexData", sizeof(regexData), 56, 44, 44);
result += check_one_struct("SharedMemory", sizeof(SharedMemory), 24, 12, 12);
result += check_one_struct("ShmSettings", sizeof(ShmSettings), 12, 12, 12);
result += check_one_struct("countersStruct", sizeof(countersStruct), 240, 240, 240);
result += check_one_struct("sqlite3_stmt_vec", sizeof(sqlite3_stmt_vec), 32, 16, 16);
result += check_one_struct("ConfigStruct", sizeof(ConfigStruct), 112, 104);
result += check_one_struct("queriesData", sizeof(queriesData), 56, 44);
result += check_one_struct("upstreamsData", sizeof(upstreamsData), 640, 624);
result += check_one_struct("clientsData", sizeof(clientsData), 696, 668);
result += check_one_struct("domainsData", sizeof(domainsData), 24, 20);
result += check_one_struct("DNSCacheData", sizeof(DNSCacheData), 16, 16);
result += check_one_struct("ednsData", sizeof(ednsData), 72, 72);
result += check_one_struct("overTimeData", sizeof(overTimeData), 32, 24);
result += check_one_struct("regexData", sizeof(regexData), 56, 44);
result += check_one_struct("SharedMemory", sizeof(SharedMemory), 24, 12);
result += check_one_struct("ShmSettings", sizeof(ShmSettings), 12, 12);
result += check_one_struct("countersStruct", sizeof(countersStruct), 240, 240);
result += check_one_struct("sqlite3_stmt_vec", sizeof(sqlite3_stmt_vec), 32, 16);
if(result == 0)
printf("All okay\n");

4
src/struct_size.c
View File

@ -12,7 +12,7 @@
#include "struct_size.h"
#include <stdio.h>
int check_one_struct(const char *struct_name, const size_t found_size, const size_t size64, const size_t size32, const size_t sizeARM)
int check_one_struct(const char *struct_name, const size_t found_size, const size_t size64, const size_t size32)
{
#if defined(__x86_64__)
const size_t expected_size = size64;
@ -27,7 +27,7 @@ int check_one_struct(const char *struct_name, const size_t found_size, const siz
const size_t expected_size = size32;
const char *arch = "mips";
#elif defined(__arm__)
const size_t expected_size = sizeARM;
const size_t expected_size = size32;
const char *arch = "arm";
#else
const size_t expected_size = 0;

2
src/struct_size.h
View File

@ -13,6 +13,6 @@
// type size_t
#include <stddef.h>
int check_one_struct(const char *struct_name, const size_t found_size, const size_t size64, const size_t size32, const size_t sizeARM);
int check_one_struct(const char *struct_name, const size_t found_size, const size_t size64, const size_t size32);
#endif // STRUCT_SIZE_HEADER