diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-03-02 13:12:45 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-03-02 13:12:45 +0000 |
| commit | c366cc6d1ac32ef94eeee12e641b2ea24ebceb12 (patch) | |
| tree | 934afd6672482d14bcbf17f3312aa68b83ed7d20 /ext/standard/dns.c | |
| parent | 8f567a5abb99b86886ede2d886507e2c22a2d67e (diff) | |
| download | php-git-c366cc6d1ac32ef94eeee12e641b2ea24ebceb12.tar.gz | |
Nuke int32_t (everywhere except streams layer) and signed/unsigned warnings
Diffstat (limited to 'ext/standard/dns.c')
| -rw-r--r-- | ext/standard/dns.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 343ba3e275..8497296486 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -462,11 +462,11 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int add_assoc_string(*subarray, "type", "HINFO", 1); n = *cp & 0xFF; cp++; - add_assoc_stringl(*subarray, "cpu", cp, n, 1); + add_assoc_stringl(*subarray, "cpu", (char*)cp, n, 1); cp += n; n = *cp & 0xFF; cp++; - add_assoc_stringl(*subarray, "os", cp, n, 1); + add_assoc_stringl(*subarray, "os", (char*)cp, n, 1); cp += n; break; case DNS_T_TXT: @@ -476,7 +476,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int memcpy(tp, cp + 1, n); tp[n] = '\0'; cp += dlen; - add_assoc_stringl(*subarray, "txt", tp, n, 0); + add_assoc_stringl(*subarray, "txt", (char*)tp, n, 0); break; case DNS_T_SOA: add_assoc_string(*subarray, "type", "SOA", 1); @@ -504,7 +504,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int add_assoc_long(*subarray, "minimum-ttl", n); break; case DNS_T_AAAA: - tp = name; + tp = (u_char*)name; for(i=0; i < 8; i++) { GETSHORT(s, cp); if (s != 0) { @@ -513,7 +513,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int tp[0] = ':'; tp++; } - tp += sprintf(tp,"%x",s); + tp += sprintf((char*)tp,"%x",s); } else { if (!have_v6_break) { have_v6_break = 1; @@ -542,7 +542,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int n = ((int)cp[0]) & 0xFF; cp++; add_assoc_long(*subarray, "masklen", n); - tp = name; + tp = (u_char*)name; if (n > 15) { have_v6_break = 1; in_v6_break = 1; @@ -557,7 +557,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int tp[0] = ':'; tp++; } - sprintf(tp, "%x", cp[0] & 0xFF); + sprintf((char*)tp, "%x", cp[0] & 0xFF); } else { if (!have_v6_break) { have_v6_break = 1; @@ -581,7 +581,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int tp[0] = ':'; tp++; } - tp += sprintf(tp,"%x",s); + tp += sprintf((char*)tp,"%x",s); } else { if (!have_v6_break) { have_v6_break = 1; @@ -633,13 +633,13 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int GETSHORT(n, cp); add_assoc_long(*subarray, "pref", n); n = (cp[0] & 0xFF); - add_assoc_stringl(*subarray, "flags", ++cp, n, 1); + add_assoc_stringl(*subarray, "flags", (char*)++cp, n, 1); cp += n; n = (cp[0] & 0xFF); - add_assoc_stringl(*subarray, "services", ++cp, n, 1); + add_assoc_stringl(*subarray, "services", (char*)++cp, n, 1); cp += n; n = (cp[0] & 0xFF); - add_assoc_stringl(*subarray, "regex", ++cp, n, 1); + add_assoc_stringl(*subarray, "regex", (char*)++cp, n, 1); cp += n; n = dn_expand(answer->qb2, answer->qb2+65536, cp, name, (sizeof name) - 2); if (n < 0) { |