[Cmake-commits] CMake branch, next, updated. v3.1.0-1364-g2a8f8d9
Brad King
brad.king at kitware.com
Tue Dec 23 08:48:32 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2a8f8d925fb30143c1a1f7ca22e125515e8c9c74 (commit)
via 1819d4ad1fb0016c20a46a0b66274b53d2b0f010 (commit)
via 6ed23ff4e9bbf848a77865e6d08c1e8e6074de92 (commit)
from 86e11c7ecd365d5c1019980ece4056b6d8e4b138 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a8f8d925fb30143c1a1f7ca22e125515e8c9c74
commit 2a8f8d925fb30143c1a1f7ca22e125515e8c9c74
Merge: 86e11c7 1819d4a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 23 08:48:31 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 23 08:48:31 2014 -0500
Merge topic 'update-kwsys' into next
1819d4ad Merge branch 'upstream-kwsys' into update-kwsys
6ed23ff4 KWSys 2014-12-23 (5a15cb3b)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1819d4ad1fb0016c20a46a0b66274b53d2b0f010
commit 1819d4ad1fb0016c20a46a0b66274b53d2b0f010
Merge: 6697765 6ed23ff
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 23 08:47:34 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 23 08:47:34 2014 -0500
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ed23ff4e9bbf848a77865e6d08c1e8e6074de92
commit 6ed23ff4e9bbf848a77865e6d08c1e8e6074de92
Author: KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Dec 23 04:22:43 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 23 08:47:29 2014 -0500
KWSys 2014-12-23 (5a15cb3b)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 5a15cb3b | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 87c65319..5a15cb3b
Brad King (1):
5a15cb3b Base64: Use size_t for lenghts in API
Change-Id: I09a2c5d6b67280f96d580c7b26bf8b2aa0bdb709
diff --git a/Base64.c b/Base64.c
index d07bdd0..4b8ede2 100644
--- a/Base64.c
+++ b/Base64.c
@@ -115,10 +115,10 @@ void kwsysBase64_Encode1(const unsigned char *src, unsigned char *dest)
actually knowing how much data to expect (if the input is not a multiple of
3 bytes then the extra padding needed to complete the encode 4 bytes will
stop the decoding anyway). */
-unsigned long kwsysBase64_Encode(const unsigned char *input,
- unsigned long length,
- unsigned char *output,
- int mark_end)
+size_t kwsysBase64_Encode(const unsigned char *input,
+ size_t length,
+ unsigned char *output,
+ int mark_end)
{
const unsigned char *ptr = input;
const unsigned char *end = input + length;
@@ -157,7 +157,7 @@ unsigned long kwsysBase64_Encode(const unsigned char *input,
optr += 4;
}
- return (unsigned long)(optr - output);
+ return (size_t)(optr - output);
}
/*--------------------------------------------------------------------------*/
@@ -207,10 +207,10 @@ int kwsysBase64_Decode3(const unsigned char *src, unsigned char *dest)
'length' parameter is ignored. This enables the caller to decode a stream
without actually knowing how much decoded data to expect (of course, the
buffer must be large enough). */
-unsigned long kwsysBase64_Decode(const unsigned char *input,
- unsigned long length,
- unsigned char *output,
- unsigned long max_input_length)
+size_t kwsysBase64_Decode(const unsigned char *input,
+ size_t length,
+ unsigned char *output,
+ size_t max_input_length)
{
const unsigned char *ptr = input;
unsigned char *optr = output;
@@ -226,7 +226,7 @@ unsigned long kwsysBase64_Decode(const unsigned char *input,
optr += len;
if(len < 3)
{
- return (unsigned long)(optr - output);
+ return (size_t)(optr - output);
}
ptr += 4;
}
@@ -240,7 +240,7 @@ unsigned long kwsysBase64_Decode(const unsigned char *input,
optr += len;
if(len < 3)
{
- return (unsigned long)(optr - output);
+ return (size_t)(optr - output);
}
ptr += 4;
}
@@ -275,5 +275,5 @@ unsigned long kwsysBase64_Decode(const unsigned char *input,
}
}
- return (unsigned long)(optr - output);
+ return (size_t)(optr - output);
}
diff --git a/Base64.h.in b/Base64.h.in
index 3468007..36ed3cc 100644
--- a/Base64.h.in
+++ b/Base64.h.in
@@ -14,6 +14,8 @@
#include <@KWSYS_NAMESPACE@/Configure.h>
+#include <stddef.h> /* size_t */
+
/* Redefine all public interface symbol names to be in the proper
namespace. These macros are used internally to kwsys only, and are
not visible to user code. Use kwsysHeaderDump.pl to reproduce
@@ -68,10 +70,10 @@ kwsysEXPORT void kwsysBase64_Encode1(const unsigned char *src,
* the extra padding needed to complete the encode 4 bytes will stop
* the decoding anyway).
*/
-kwsysEXPORT unsigned long kwsysBase64_Encode(const unsigned char *input,
- unsigned long length,
- unsigned char *output,
- int mark_end);
+kwsysEXPORT size_t kwsysBase64_Encode(const unsigned char *input,
+ size_t length,
+ unsigned char *output,
+ int mark_end);
/**
* Decode 4 bytes into a 3 byte string. Returns the number of bytes
@@ -92,10 +94,10 @@ kwsysEXPORT int kwsysBase64_Decode3(const unsigned char *src,
* much decoded data to expect (of course, the buffer must be large
* enough).
*/
-kwsysEXPORT unsigned long kwsysBase64_Decode(const unsigned char *input,
- unsigned long length,
- unsigned char *output,
- unsigned long max_input_length);
+kwsysEXPORT size_t kwsysBase64_Decode(const unsigned char *input,
+ size_t length,
+ unsigned char *output,
+ size_t max_input_length);
#if defined(__cplusplus)
} /* extern "C" */
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/Base64.c | 24 ++++++++++++------------
Source/kwsys/Base64.h.in | 18 ++++++++++--------
2 files changed, 22 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list