Sing, "we are apr"... and make all hash functions accept apr_ssize_t

  if we are going to bury -1 flags (I'd prefer the flag cast to apr_size_t
  and use that value throughout the hash api, however.)


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61649 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/strings/apr_snprintf.c b/strings/apr_snprintf.c
index 5bccc15b5..2973191bf 100644
--- a/strings/apr_snprintf.c
+++ b/strings/apr_snprintf.c
@@ -1199,7 +1199,7 @@ static int snprintf_flush(apr_vformatter_buff_t *vbuff)
 }
 
 
-APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, size_t len, 
+APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, apr_size_t len, 
                                    const char *format, ...)
 {
     int cc;
@@ -1216,11 +1216,11 @@ APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, size_t len,
     cc = apr_vformatter(snprintf_flush, &vbuff, format, ap);
     va_end(ap);
     *vbuff.curpos = '\0';
-    return (cc == -1) ? len : cc;
+    return (cc == -1) ? (int)len : cc;
 }
 
 
-APR_DECLARE(int) apr_vsnprintf(char *buf, size_t len, const char *format,
+APR_DECLARE(int) apr_vsnprintf(char *buf, apr_size_t len, const char *format,
 			     va_list ap)
 {
     int cc;
@@ -1234,5 +1234,5 @@ APR_DECLARE(int) apr_vsnprintf(char *buf, size_t len, const char *format,
     vbuff.endpos = buf + len - 1;
     cc = apr_vformatter(snprintf_flush, &vbuff, format, ap);
     *vbuff.curpos = '\0';
-    return (cc == -1) ? len : cc;
+    return (cc == -1) ? (int)len : cc;
 }