[Cmake-commits] CMake branch, next, updated. v3.1.0-1965-gfb74a6f

[Brad King]

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  fb74a6fbfbbf235ce1c34323825b703ed453af7b (commit)
       via  6b9a0e17970391d2f7143ed9c600d5ea50dd6b98 (commit)
      from  97e993b0bd69af48d664aa4e77e535d3a85d4bbc (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=fb74a6fbfbbf235ce1c34323825b703ed453af7b
commit fb74a6fbfbbf235ce1c34323825b703ed453af7b
Merge: 97e993b 6b9a0e17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 15:05:11 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 15 15:05:11 2015 -0500

    Merge topic 'libarchive-constify-internal-get_date' into next
    
    6b9a0e17 libarchive: Constify internal __archive_get_date implementation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b9a0e17970391d2f7143ed9c600d5ea50dd6b98
commit 6b9a0e17970391d2f7143ed9c600d5ea50dd6b98
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 14 13:25:56 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 15 11:48:10 2015 -0500

    libarchive: Constify internal __archive_get_date implementation
    
    The caller of this API already re-declares it as const, so update the
    implementation accordingly.

diff --git a/Utilities/cmlibarchive/libarchive/archive_getdate.c b/Utilities/cmlibarchive/libarchive/archive_getdate.c
index aaa9d6f..f665e2d 100644
--- a/Utilities/cmlibarchive/libarchive/archive_getdate.c
+++ b/Utilities/cmlibarchive/libarchive/archive_getdate.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <time.h>
 
 /* This file defines a single public function. */
-time_t __archive_get_date(time_t now, char *);
+time_t __archive_get_date(time_t now, const char *);
 
 /* Basic time units. */
 #define	EPOCH		1970
@@ -782,7 +782,7 @@ RelativeMonth(time_t Start, time_t Timezone, time_t RelMonth)
  * Tokenizer.
  */
 static int
-nexttoken(char **in, time_t *value)
+nexttoken(const char **in, time_t *value)
 {
 	char	c;
 	char	buff[64];
@@ -809,7 +809,7 @@ nexttoken(char **in, time_t *value)
 		/* Try the next token in the word table first. */
 		/* This allows us to match "2nd", for example. */
 		{
-			char *src = *in;
+			const char *src = *in;
 			const struct LEXICON *tp;
 			unsigned i = 0;
 
@@ -894,7 +894,7 @@ difftm (struct tm *a, struct tm *b)
  * TODO: tokens[] array should be dynamically sized.
  */
 time_t
-__archive_get_date(time_t now, char *p)
+__archive_get_date(time_t now, const char *p)
 {
 	struct token	tokens[256];
 	struct gdstate	_gds;

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_getdate.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake