diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2015-11-25 22:04:32 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2015-11-25 22:04:32 +0100 |
| commit | cf89e968173e5a279fd26ccb9c583fb59a5a4af8 (patch) | |
| tree | 39ab51d38dcf55ef30af57b682b09f7438146837 /test | |
| parent | a28352a03ce559fb05d88d3f28228ab19e9b54d5 (diff) | |
Testsuite: fakens/inet_pton on solaris again
Diffstat (limited to 'test')
| -rw-r--r-- | test/src/fakens.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/src/fakens.c b/test/src/fakens.c index 444422124..63cc59da2 100644 --- a/test/src/fakens.c +++ b/test/src/fakens.c @@ -99,7 +99,7 @@ typedef unsigned char uschar; #define Ustrlen(s) (int)strlen(CCS(s)) #define Ustrncmp(s,t,n) strncmp(CCS(s),CCS(t),n) #define Ustrncpy(s,t,n) strncpy(CS(s),CCS(t),n) -#define Ustrtok(s,t) strtok(CS(s),CCS(t)) +#define Ustrtok(s,t) (uschar*)strtok(CS(s),CCS(t)) typedef struct zoneitem { uschar *zone; @@ -488,12 +488,12 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL) { case ns_t_soa: p = Ustrtok(p, " "); - ep = p + strlen(p); + ep = p + Ustrlen(p); if (ep[-1] != '.') sprintf(CS ep, "%s.", zone); pk = packname(p, pk); /* primary ns */ p = Ustrtok(NULL, " "); pk = packname(p , pk); /* responsible mailbox */ - *(p += strlen(p)) = ' '; + *(p += Ustrlen(p)) = ' '; while (isspace(*p)) p++; pk = longfield(&p, pk); /* serial */ pk = longfield(&p, pk); /* refresh */ @@ -503,12 +503,12 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL) break; case ns_t_a: - inet_pton(AF_INET, p, pk); /* FIXME: error checking */ + inet_pton(AF_INET, CCS p, pk); /* FIXME: error checking */ pk += 4; break; case ns_t_aaaa: - inet_pton(AF_INET6, p, pk); /* FIXME: error checking */ + inet_pton(AF_INET6, CCS p, pk); /* FIXME: error checking */ pk += 16; break; |