uint32_t -> isc_uint32_t

diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index 717a95d32ee35bc4ed625aed9d66389a1294948f..1c89ae4535a41c72b3bae48f1e439773502c9421 100644 (file)
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.h,v 1.11 2010/12/20 23:47:21 tbox Exp $ */
+/* $Id: sdlz.h,v 1.12 2011/01/13 06:29:16 marka Exp $ */
 
 /*! \file dns/sdlz.h */
 
@@ -236,7 +236,7 @@ typedef isc_boolean_t (*dns_sdlzssumatch_t)(const char *signer,
                                            const char *tcpaddr,
                                            const char *type,
                                            const char *key,
-                                           uint32_t keydatalen,
+                                           isc_uint32_t keydatalen,
                                            uint8_t *keydata,
                                            void *driverarg,
                                            void *dbdata);

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 992725718039cd625c8fbad4b5f341c0e8caf4c2..8589b3bc243de3017c3d1f0301b59ad1b6da3d16 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.c,v 1.30 2011/01/13 04:59:25 tbox Exp $ */
+/* $Id: sdlz.c,v 1.31 2011/01/13 06:29:16 marka Exp $ */
 
 /*! \file */
 
@@ -1682,7 +1682,7 @@ dns_sdlzssumatch(dns_name_t *signer, dns_name_t *name, isc_netaddr_t *tcpaddr,
        char b_key[DST_KEY_FORMATSIZE];
        isc_buffer_t *tkey_token;
        isc_region_t token_region;
-       uint32_t token_len = 0;
+       isc_uint32_t token_len = 0;
        isc_boolean_t ret;
 
        REQUIRE(driverarg != NULL);

diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c
index 3a5141fb4efced266f97a86a841e3261e6954e8b..8c75b3839b0361fa6a07e0d6fdf0652a814310e3 100644 (file)
--- a/lib/dns/ssu_external.c
+++ b/lib/dns/ssu_external.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ssu_external.c,v 1.4 2011/01/07 23:47:07 tbox Exp $ */
+/* $Id: ssu_external.c,v 1.5 2011/01/13 06:29:16 marka Exp $ */
 
 /*
  * This implements external update-policy rules.  This allows permission
@@ -134,8 +134,8 @@ dns_ssu_external_match(dns_name_t *identity,
        isc_region_t token_region;
        uint8_t *data;
        isc_buffer_t buf;
-       uint32_t token_len = 0;
-       uint32_t reply;
+       isc_uint32_t token_len = 0;
+       isc_uint32_t reply;
        ssize_t ret;
 
        /* The identity contains local:/path/to/socket */
@@ -180,14 +180,14 @@ dns_ssu_external_match(dns_name_t *identity,
        }
 
        /* Work out how big the request will be */
-       req_len = sizeof(uint32_t)     + /* Format version */
-                 sizeof(uint32_t)     + /* Length */
+       req_len = sizeof(isc_uint32_t)     + /* Format version */
+                 sizeof(isc_uint32_t)     + /* Length */
                  strlen(b_signer) + 1 + /* Signer */
                  strlen(b_name) + 1   + /* Name */
                  strlen(b_addr) + 1   + /* Address */
                  strlen(b_type) + 1   + /* Type */
                  strlen(b_key) + 1    + /* Key */
-                 sizeof(uint32_t)     + /* tkey_token length */
+                 sizeof(isc_uint32_t)     + /* tkey_token length */
                  token_len;             /* tkey_token */
 
 
@@ -233,8 +233,8 @@ dns_ssu_external_match(dns_name_t *identity,
        }
 
        /* Receive the reply */
-       ret = read(fd, &reply, sizeof(uint32_t));
-       if (ret != (ssize_t) sizeof(uint32_t)) {
+       ret = read(fd, &reply, sizeof(isc_uint32_t));
+       if (ret != (ssize_t) sizeof(isc_uint32_t)) {
                char strbuf[ISC_STRERRORSIZE];
                isc__strerror(errno, strbuf, sizeof(strbuf));
                ssu_e_log(3, "ssu_external: unable to receive reply - %s",