You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2018/05/24 18:49:56 UTC
[1/3] qpid-dispatch git commit: NO-JIRA: Fix some warnings in gcc
8.1.1
Repository: qpid-dispatch
Updated Branches:
refs/heads/master e39ef7bf9 -> e96256509
NO-JIRA: Fix some warnings in gcc 8.1.1
There is one remaining error in src/policy.c which I was unclear on,
to suppress compile with
cmake -DCMAKE_C_FLAGS=-Wno-stringop-truncation
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/e9625650
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/e9625650
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/e9625650
Branch: refs/heads/master
Commit: e96256509d23d611426da8355cd9bf9f256e8173
Parents: acda247
Author: Alan Conway <ac...@redhat.com>
Authored: Thu May 24 14:39:11 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu May 24 14:49:32 2018 -0400
----------------------------------------------------------------------
src/policy.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/e9625650/src/policy.c
----------------------------------------------------------------------
diff --git a/src/policy.c b/src/policy.c
index ae93c18..377aeac 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -517,7 +517,7 @@ char * _qd_policy_link_user_name_subst(const char *uname, const char *proposed,
if (strlen(uname) == 0)
return NULL;
- const char *duser = "${user}";
+ const char duser[] = "${user}";
char *retptr = obuf;
const char *wiptr = proposed;
const char *findptr = strstr(proposed, uname);
@@ -535,7 +535,7 @@ char * _qd_policy_link_user_name_subst(const char *uname, const char *proposed,
obuf += copysize;
// Copy the substitution string
- segsize = strlen(duser);
+ segsize = sizeof(duser);
copysize = MIN(osize, segsize);
if (copysize)
strncpy(obuf, duser, copysize);
@@ -581,7 +581,7 @@ bool _qd_policy_approve_link_name(const char *username, const char *allowed, con
if (!pa)
return false;
- strncpy(pa, allowed, a_len);
+ strcpy(pa, allowed); /* We know we have allocated enoough space */
pa[a_len] = 0;
// Do reverse user substitution into proposed
char substbuf[QPALN_USERBUFSIZE];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-dispatch git commit: NO-JIRA: Upgrade required CMake to
2.6.2 to silence annoying warnings
Posted by ac...@apache.org.
NO-JIRA: Upgrade required CMake to 2.6.2 to silence annoying warnings
Even RHEL-4 is up to CMake 2.6.4 so it seems unlikely this will cause problems.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/acda2479
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/acda2479
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/acda2479
Branch: refs/heads/master
Commit: acda24792561c9f119a2574eab7249ea23ed9692
Parents: ab43cf1
Author: Alan Conway <ac...@redhat.com>
Authored: Thu May 24 14:23:12 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu May 24 14:49:32 2018 -0400
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/acda2479/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e13a45c..1db08a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ option(QD_MEMORY_STATS "Track memory pool usage statistics" ON)
file(STRINGS "${CMAKE_SOURCE_DIR}/VERSION.txt" QPID_DISPATCH_VERSION)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6.2)
include(CheckLibraryExists)
include(CheckSymbolExists)
include(CheckFunctionExists)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-dispatch git commit: NO-JIRA: fix compiler "unused
variable" error in release builds
Posted by ac...@apache.org.
NO-JIRA: fix compiler "unused variable" error in release builds
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ab43cf19
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ab43cf19
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ab43cf19
Branch: refs/heads/master
Commit: ab43cf19d5d26b7b57e982332fbe4355caaf70a8
Parents: e39ef7b
Author: Alan Conway <ac...@redhat.com>
Authored: Fri May 18 10:05:49 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu May 24 14:49:32 2018 -0400
----------------------------------------------------------------------
src/policy.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ab43cf19/src/policy.c
----------------------------------------------------------------------
diff --git a/src/policy.c b/src/policy.c
index b1a231d..ae93c18 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -840,9 +840,8 @@ bool qd_policy_host_pattern_add(qd_policy_t *policy, char *hostPattern)
void *oldp = qd_parse_tree_add_pattern_str(policy->hostname_tree, hostPattern, hostPattern);
if (oldp) {
void *recovered = qd_parse_tree_add_pattern_str(policy->hostname_tree, (char *)oldp, oldp);
- if (!recovered) {
- assert (recovered);
- }
+ assert (recovered);
+ (void)recovered; /* Silence compiler complaints of unused variable */
}
sys_mutex_unlock(policy->tree_lock);
if (oldp)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org