summaryrefslogtreecommitdiff
path: root/common/lib
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2006-10-18 14:49:21 +0000
committermartin <martin@NetBSD.org>2006-10-18 14:49:21 +0000
commitec465210f293c85d6e4289dfec5d64ef052ded7d (patch)
tree1f63aaff4b77fd437e33d6081b2357f0813af6f0 /common/lib
parentb6f68b374003848ae44983cdc1eabf7037380d19 (diff)
Sprinkle a few size_t casts to avoid conversion warnings.
Diffstat (limited to 'common/lib')
-rw-r--r--common/lib/libprop/prop_dictionary.c4
-rw-r--r--common/lib/libprop/prop_object.c4
-rw-r--r--common/lib/libprop/prop_object_impl.h4
-rw-r--r--common/lib/libprop/prop_string.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/common/lib/libprop/prop_dictionary.c b/common/lib/libprop/prop_dictionary.c
index a29a59b0cc5..90f9f2230d2 100644
--- a/common/lib/libprop/prop_dictionary.c
+++ b/common/lib/libprop/prop_dictionary.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_dictionary.c,v 1.13 2006/10/03 15:45:04 thorpej Exp $ */
+/* $NetBSD: prop_dictionary.c,v 1.14 2006/10/18 14:49:21 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@ struct _prop_dictionary_keysym {
#define PDK_SIZE_32 (sizeof(struct _prop_dictionary_keysym) + 32)
#define PDK_SIZE_128 (sizeof(struct _prop_dictionary_keysym) + 128)
-#define PDK_MAXKEY 128
+#define PDK_MAXKEY ((size_t)128)
_PROP_POOL_INIT(_prop_dictionary_keysym16_pool, PDK_SIZE_16, "pdict16")
_PROP_POOL_INIT(_prop_dictionary_keysym32_pool, PDK_SIZE_32, "pdict32")
diff --git a/common/lib/libprop/prop_object.c b/common/lib/libprop/prop_object.c
index fc2fd5b27b2..090c79e0f9a 100644
--- a/common/lib/libprop/prop_object.c
+++ b/common/lib/libprop/prop_object.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_object.c,v 1.9 2006/10/16 03:21:07 thorpej Exp $ */
+/* $NetBSD: prop_object.c,v 1.10 2006/10/18 14:49:21 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -224,7 +224,7 @@ _prop_object_externalize_append_encoded_cstring(
return (TRUE);
}
-#define BUF_EXPAND 256
+#define BUF_EXPAND ((size_t)256)
/*
* _prop_object_externalize_append_char --
diff --git a/common/lib/libprop/prop_object_impl.h b/common/lib/libprop/prop_object_impl.h
index 842112d819f..f8ed7d3f825 100644
--- a/common/lib/libprop/prop_object_impl.h
+++ b/common/lib/libprop/prop_object_impl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_object_impl.h,v 1.9 2006/10/16 03:21:07 thorpej Exp $ */
+/* $NetBSD: prop_object_impl.h,v 1.10 2006/10/18 14:49:21 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -284,7 +284,7 @@ void * _prop_standalone_realloc(void *, size_t);
#define _PROP_ASSERT(x) /*LINTED*/assert(x)
#define _PROP_MALLOC(s, t) malloc((s))
-#define _PROP_CALLOC(s, t) calloc(1, (s))
+#define _PROP_CALLOC(s, t) calloc((size_t)1, (s))
#define _PROP_REALLOC(v, s, t) realloc((v), (s))
#define _PROP_FREE(v, t) free((v))
diff --git a/common/lib/libprop/prop_string.c b/common/lib/libprop/prop_string.c
index ded7a5925db..3f170d25e7f 100644
--- a/common/lib/libprop/prop_string.c
+++ b/common/lib/libprop/prop_string.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_string.c,v 1.4 2006/08/22 21:21:23 thorpej Exp $ */
+/* $NetBSD: prop_string.c,v 1.5 2006/10/18 14:49:21 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -428,7 +428,7 @@ _prop_string_internalize(struct _prop_object_internalize_context *ctx)
return (NULL);
/* Compute the length of the result. */
- if (_prop_object_internalize_decode_string(ctx, NULL, 0, &len,
+ if (_prop_object_internalize_decode_string(ctx, NULL, (size_t)0, &len,
NULL) == FALSE)
return (NULL);