[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-485-g7c3dd73
Brad King
brad.king at kitware.com
Thu Feb 23 07:12:33 EST 2017
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 7c3dd733d37449045a062f0ecc1c465b06163e58 (commit)
via 1f37e987d0d2dcfdb55d4248d3f7ade9de68ec71 (commit)
via 64c33f118272a5d1f8d380587b6a67615eadcc57 (commit)
from 4e78fde27cf461a80bece2e82b84a3356249b92c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c3dd733d37449045a062f0ecc1c465b06163e58
commit 7c3dd733d37449045a062f0ecc1c465b06163e58
Merge: 4e78fde 1f37e98
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 07:12:32 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 07:12:32 2017 -0500
Merge topic 'update-libarchive' into next
1f37e987 libarchive: Avoid using isblank
64c33f11 libarchive: Avoid declaration after statement in C code
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f37e987d0d2dcfdb55d4248d3f7ade9de68ec71
commit 1f37e987d0d2dcfdb55d4248d3f7ade9de68ec71
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 06:57:26 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 06:57:26 2017 -0500
libarchive: Avoid using isblank
It is not available on VS 2012 and below.
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
index 5e22438..1e3b518 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
@@ -531,6 +531,10 @@ time_from_tm(struct tm *t)
#endif
}
+static int la_isblank(int c) {
+ return c == ' ' || c == '\t';
+}
+
static time_t
xstrpisotime(const char *s, char **endptr)
{
@@ -543,7 +547,7 @@ xstrpisotime(const char *s, char **endptr)
/* as a courtesy to our callers, and since this is a non-standard
* routine, we skip leading whitespace */
- while (isblank((unsigned char)*s))
+ while (la_isblank((unsigned char)*s))
++s;
/* read year */
@@ -619,7 +623,7 @@ _warc_rdver(const char *buf, size_t bsz)
if (memcmp(buf + 3U + end, "\r\n", 2U) != 0)
ver = 0U;
} else if (ver < 1200U) {
- if (!isblank(*(buf + 3U + end)))
+ if (!la_isblank(*(buf + 3U + end)))
ver = 0U;
}
}
@@ -643,7 +647,7 @@ _warc_rdtyp(const char *buf, size_t bsz)
}
/* overread whitespace */
- while (val < eol && isblank((unsigned char)*val))
+ while (val < eol && la_isblank((unsigned char)*val))
++val;
if (val + 8U == eol) {
@@ -673,7 +677,7 @@ _warc_rduri(const char *buf, size_t bsz)
return res;
}
- while (val < eol && isblank((unsigned char)*val))
+ while (val < eol && la_isblank((unsigned char)*val))
++val;
/* overread URL designators */
@@ -731,7 +735,7 @@ _warc_rdlen(const char *buf, size_t bsz)
}
/* skip leading whitespace */
- while (val < eol && isblank(*val))
+ while (val < eol && la_isblank(*val))
val++;
/* there must be at least one digit */
if (!isdigit(*val))
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64c33f118272a5d1f8d380587b6a67615eadcc57
commit 64c33f118272a5d1f8d380587b6a67615eadcc57
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 06:50:21 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 06:50:21 2017 -0500
libarchive: Avoid declaration after statement in C code
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
index eb98491..4adf68e 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
@@ -4074,8 +4074,10 @@ write_information_block(struct archive_write *a)
memset(info.s, 0, info_size);
opt = 0;
#if defined(HAVE__CTIME64_S)
- __time64_t iso9660_birth_time_tmp = (__time64_t) iso9660->birth_time; //time_t may be shorter than 64 bits
- _ctime64_s(buf, sizeof(buf), &(iso9660_birth_time_tmp));
+ {
+ __time64_t iso9660_birth_time_tmp = (__time64_t) iso9660->birth_time; //time_t may be shorter than 64 bits
+ _ctime64_s(buf, sizeof(buf), &(iso9660_birth_time_tmp));
+ }
#elif defined(HAVE_CTIME_R)
ctime_r(&(iso9660->birth_time), buf);
#else
-----------------------------------------------------------------------
Summary of changes:
.../libarchive/archive_read_support_format_warc.c | 14 +++++++++-----
.../libarchive/archive_write_set_format_iso9660.c | 6 ++++--
2 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list