You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by fa...@apache.org on 2014/12/13 08:09:47 UTC

qpid-proton git commit: PROTON-774: Fix warnings in log.c and url.c and re-enable -Werror in JavaScript CmakeLists.txt

Repository: qpid-proton
Updated Branches:
  refs/heads/master 92560fa6c -> ed79dbedd


PROTON-774: Fix warnings in log.c and url.c and re-enable -Werror in JavaScript CmakeLists.txt


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ed79dbed
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ed79dbed
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ed79dbed

Branch: refs/heads/master
Commit: ed79dbedda498c5bb3a8ef1e764395fafbd3a63b
Parents: 92560fa
Author: Fraser Adams <fa...@apache.org>
Authored: Sat Dec 13 07:08:36 2014 +0000
Committer: Fraser Adams <fa...@apache.org>
Committed: Sat Dec 13 07:08:36 2014 +0000

----------------------------------------------------------------------
 proton-c/bindings/javascript/CMakeLists.txt | 4 +---
 proton-c/src/log.c                          | 4 ++--
 proton-c/src/url.c                          | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ed79dbed/proton-c/bindings/javascript/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/javascript/CMakeLists.txt b/proton-c/bindings/javascript/CMakeLists.txt
index c5b1d60..288201f 100644
--- a/proton-c/bindings/javascript/CMakeLists.txt
+++ b/proton-c/bindings/javascript/CMakeLists.txt
@@ -96,9 +96,7 @@ add_custom_command(
   DEPENDS ${PN_PATH}/src/protocol.h.py
   )
 
-#set(COMPILE_WARNING_FLAGS "-Werror -Wall -pedantic-errors -Wno-comment -Wno-warn-absolute-paths")
-#TODO re-add -Werror when warning had been fixed.
-set(COMPILE_WARNING_FLAGS "-Wall -pedantic-errors -Wno-comment -Wno-warn-absolute-paths")
+set(COMPILE_WARNING_FLAGS "-Werror -Wall -pedantic-errors -Wno-comment -Wno-warn-absolute-paths")
 
 # Explicitly set PLATFORM_DEFINITIONS to Linux ones for emscripten as we don't
 # want to inadvertently use Windows versions if we happen to be cross-compiling

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ed79dbed/proton-c/src/log.c
----------------------------------------------------------------------
diff --git a/proton-c/src/log.c b/proton-c/src/log.c
index 2506de3..1140561 100644
--- a/proton-c/src/log.c
+++ b/proton-c/src/log.c
@@ -34,8 +34,8 @@ void pn_log_init() {
     enabled = pn_env_bool("PN_TRACE_LOG");
 }
 
-void pn_log_enable(bool enabled) {
-    enabled = enabled;
+void pn_log_enable(bool new_enabled) {
+    enabled = new_enabled;
 }
 
 bool pn_log_enabled() {

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ed79dbed/proton-c/src/url.c
----------------------------------------------------------------------
diff --git a/proton-c/src/url.c b/proton-c/src/url.c
index 12d6f9d..2e1c4f0 100644
--- a/proton-c/src/url.c
+++ b/proton-c/src/url.c
@@ -130,8 +130,6 @@ PN_EXTERN void pn_url_clear(pn_url_t *url) {
     pn_string_clear(url->str);
 }
 
-static inline int len(const char *str) { return str ? strlen(str) : 0; }
-
 /** Return the string form of a URL. */
 PN_EXTERN const char *pn_url_str(pn_url_t *url) {
     if (pn_string_get(url->str) == NULL) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org