mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-08-31 04:09:53 +02:00
updated to new 32bit arguments in ldns api
git-svn-id: file:///svn/unbound/trunk@456 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
@@ -399,7 +399,7 @@ get_origin(const char* name, int lineno, ldns_rdf** origin, char* parse)
|
||||
|
||||
/* Reads one entry from file. Returns entry or NULL on error. */
|
||||
struct entry*
|
||||
read_entry(FILE* in, const char* name, int *lineno, uint16_t* default_ttl,
|
||||
read_entry(FILE* in, const char* name, int *lineno, uint32_t* default_ttl,
|
||||
ldns_rdf** origin, ldns_rdf** prev_rr)
|
||||
{
|
||||
struct entry* current = NULL;
|
||||
@@ -433,7 +433,7 @@ read_entry(FILE* in, const char* name, int *lineno, uint16_t* default_ttl,
|
||||
get_origin(name, *lineno, origin, (char*)parse);
|
||||
continue;
|
||||
} else if(str_keyword(&parse, "$TTL")) {
|
||||
*default_ttl = (uint16_t)atoi(parse);
|
||||
*default_ttl = (uint32_t)atoi(parse);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -507,7 +507,7 @@ read_datafile(const char* name)
|
||||
struct entry* current = NULL;
|
||||
FILE *in;
|
||||
int lineno = 0;
|
||||
uint16_t default_ttl = 0;
|
||||
uint32_t default_ttl = 0;
|
||||
ldns_rdf* origin = NULL;
|
||||
ldns_rdf* prev_rr = NULL;
|
||||
int entry_num = 0;
|
||||
|
||||
@@ -210,7 +210,7 @@ void delete_entry(struct entry* list);
|
||||
* @return: The entry read (malloced) or NULL if no entry could be read.
|
||||
*/
|
||||
struct entry* read_entry(FILE* in, const char* name, int *lineno,
|
||||
uint16_t* default_ttl, ldns_rdf** origin, ldns_rdf** prev_rr);
|
||||
uint32_t* default_ttl, ldns_rdf** origin, ldns_rdf** prev_rr);
|
||||
|
||||
/**
|
||||
* finds entry in list, or returns NULL.
|
||||
|
||||
+3
-3
@@ -112,7 +112,7 @@ strip_end_white(char* p)
|
||||
*/
|
||||
static struct replay_range*
|
||||
replay_range_read(char* remain, FILE* in, const char* name, int* lineno,
|
||||
char* line, uint16_t* ttl, ldns_rdf** or, ldns_rdf** prev)
|
||||
char* line, uint32_t* ttl, ldns_rdf** or, ldns_rdf** prev)
|
||||
{
|
||||
struct replay_range* rng = (struct replay_range*)malloc(
|
||||
sizeof(struct replay_range));
|
||||
@@ -184,7 +184,7 @@ replay_range_read(char* remain, FILE* in, const char* name, int* lineno,
|
||||
*/
|
||||
static struct replay_moment*
|
||||
replay_moment_read(char* remain, FILE* in, const char* name, int* lineno,
|
||||
uint16_t* ttl, ldns_rdf** or, ldns_rdf** prev)
|
||||
uint32_t* ttl, ldns_rdf** or, ldns_rdf** prev)
|
||||
{
|
||||
struct replay_moment* mom = (struct replay_moment*)malloc(
|
||||
sizeof(struct replay_moment));
|
||||
@@ -275,7 +275,7 @@ replay_scenario_read(FILE* in, const char* name, int* lineno)
|
||||
char line[MAX_LINE_LEN];
|
||||
char *parse;
|
||||
struct replay_scenario* scen = NULL;
|
||||
uint16_t ttl = 3600;
|
||||
uint32_t ttl = 3600;
|
||||
ldns_rdf* or = NULL;
|
||||
ldns_rdf* prev = NULL;
|
||||
line[MAX_LINE_LEN-1]=0;
|
||||
|
||||
Reference in New Issue
Block a user