Fix size types

Upstream pull request:
https://github.com/heimdal/heimdal/pull/354

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(parts of cherry picked Samba commit 72979d1d60ca2eab1e7903c2e77b8cca69667691)

diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c
index 4c63f00f37b3ffd4a00a367d999f406d98ed590c..278439bf944b5bd672b32bc9ebb6805033d4ab7a 100644 (file)
--- a/lib/asn1/gen.c
+++ b/lib/asn1/gen.c
@@ -539,7 +539,7 @@ is_primitive_type(int type)
 }
 
 static void
-space(int level)
+space(size_t level)
 {
     while(level-- > 0)
        fprintf(headerfile, "  ");
@@ -568,7 +568,7 @@ have_ellipsis(Type *t)
 }
 
 static void
-define_asn1 (int level, Type *t)
+define_asn1 (size_t level, Type *t)
 {
     switch (t->type) {
     case TType:

diff --git a/lib/hx509/cert.c b/lib/hx509/cert.c
index 6cb871d964069907ce0d566a5fefde5d44c8eb00..3627f97f1e47dd2f433053acc3dea6f2ae04892a 100644 (file)
--- a/lib/hx509/cert.c
+++ b/lib/hx509/cert.c
@@ -2152,7 +2152,8 @@ hx509_verify_path(hx509_context context,
 {
     hx509_name_constraints nc;
     hx509_path path;
-    int ret, proxy_cert_depth, selfsigned_depth, diff;
+    int ret, diff;
+    size_t proxy_cert_depth, selfsigned_depth;
     size_t i, k;
     enum certtype type;
     Name proxy_issuer;

diff --git a/lib/roken/resolve.c b/lib/roken/resolve.c
index 98be0cb87f8a95fb23f3e87d9ea5c9241f9d40a2..8b7ad77645eb29d170b373b1c3a38d07b8e6f7cd 100644 (file)
--- a/lib/roken/resolve.c
+++ b/lib/roken/resolve.c
@@ -628,7 +628,7 @@ rk_dns_srv_order(struct rk_dns_reply *r)
 {
     struct rk_resource_record **srvs, **ss, **headp;
     struct rk_resource_record *rr;
-    int num_srv = 0;
+    size_t num_srv = 0;
 
     rk_random_init();