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/09/12 18:54:14 UTC
qpid-proton git commit: PROTON-1929: [c] move pn_log_data from util.c
to log.c
Repository: qpid-proton
Updated Branches:
refs/heads/master 7e3d648e4 -> c2e39920a
PROTON-1929: [c] move pn_log_data from util.c to log.c
util.c should not depend on anything but standard C libraries.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/c2e39920
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/c2e39920
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/c2e39920
Branch: refs/heads/master
Commit: c2e39920a7fc762ea7943c62a07a4e2af08bfd60
Parents: 7e3d648
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Sep 12 13:35:17 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Sep 12 13:35:55 2018 -0400
----------------------------------------------------------------------
c/src/core/log.c | 18 +++++++++++++++---
c/src/core/log_private.h | 2 ++
c/src/core/util.c | 14 --------------
c/src/core/util.h | 1 -
c/tests/fuzz/CMakeLists.txt | 17 ++++++-----------
5 files changed, 23 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c2e39920/c/src/core/log.c
----------------------------------------------------------------------
diff --git a/c/src/core/log.c b/c/src/core/log.c
index ed04573..9a71d1e 100644
--- a/c/src/core/log.c
+++ b/c/src/core/log.c
@@ -17,12 +17,12 @@
* under the License.
*/
-#include <proton/log.h>
-#include <proton/object.h>
-#include <stdio.h>
#include "log_private.h"
#include "util.h"
+#include <proton/error.h>
+#include <proton/log.h>
+#include <proton/object.h>
static void stderr_logger(const char *message) {
fprintf(stderr, "%s\n", message);
@@ -69,3 +69,15 @@ void pni_logf_impl(const char *fmt, ...) {
va_end(ap);
}
+void pn_log_data(const char *msg, const char *bytes, size_t size)
+{
+ char buf[256];
+ ssize_t n = pn_quote_data(buf, 256, bytes, size);
+ if (n >= 0) {
+ pn_logf("%s: %s", msg, buf);
+ } else if (n == PN_OVERFLOW) {
+ pn_logf("%s: %s (truncated)", msg, buf);
+ } else {
+ pn_logf("%s: cannot log data: %s", msg, pn_code(n));
+ }
+}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c2e39920/c/src/core/log_private.h
----------------------------------------------------------------------
diff --git a/c/src/core/log_private.h b/c/src/core/log_private.h
index 75044ed..80f3002 100644
--- a/c/src/core/log_private.h
+++ b/c/src/core/log_private.h
@@ -49,6 +49,8 @@ PN_EXTERN void pni_logf_impl(const char* fmt, ...);
/**@internal*/
PN_EXTERN void pni_vlogf_impl(const char *fmt, va_list ap);
+/**@internal*/
+void pn_log_data(const char *msg, const char *bytes, size_t size);
#endif
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c2e39920/c/src/core/util.c
----------------------------------------------------------------------
diff --git a/c/src/core/util.c b/c/src/core/util.c
index 2597d60..39bea4d 100644
--- a/c/src/core/util.c
+++ b/c/src/core/util.c
@@ -20,7 +20,6 @@
*/
#include "buffer.h"
-#include "log_private.h"
#include "util.h"
#include <proton/error.h>
@@ -82,19 +81,6 @@ int pn_quote(pn_string_t *dst, const char *src, size_t size)
}
}
-void pn_log_data(const char *msg, const char *bytes, size_t size)
-{
- char buf[256];
- ssize_t n = pn_quote_data(buf, 256, bytes, size);
- if (n >= 0) {
- pn_logf("%s: %s", msg, buf);
- } else if (n == PN_OVERFLOW) {
- pn_logf("%s: %s (truncated)", msg, buf);
- } else {
- pn_logf("%s: cannot log data: %s", msg, pn_code(n));
- }
-}
-
int pn_strcasecmp(const char *a, const char *b)
{
int diff;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c2e39920/c/src/core/util.h
----------------------------------------------------------------------
diff --git a/c/src/core/util.h b/c/src/core/util.h
index 559fbaa..baddff0 100644
--- a/c/src/core/util.h
+++ b/c/src/core/util.h
@@ -36,7 +36,6 @@
ssize_t pn_quote_data(char *dst, size_t capacity, const char *src, size_t size);
int pn_quote(pn_string_t *dst, const char *src, size_t size);
-void pn_log_data(const char *msg, const char *bytes, size_t size);
bool pn_env_bool(const char *name);
pn_timestamp_t pn_timestamp_min(pn_timestamp_t a, pn_timestamp_t b);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c2e39920/c/tests/fuzz/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/c/tests/fuzz/CMakeLists.txt b/c/tests/fuzz/CMakeLists.txt
index 1af7e50..9880bdc 100644
--- a/c/tests/fuzz/CMakeLists.txt
+++ b/c/tests/fuzz/CMakeLists.txt
@@ -30,9 +30,10 @@ endif ()
add_library (StandaloneFuzzTargetMain STATIC StandaloneFuzzTargetMain.c StandaloneFuzzTargetInit.c)
-macro (pn_add_fuzz_test_no_proton test)
+macro (pn_add_fuzz_test test)
add_executable (${test} ${ARGN})
- target_link_libraries (${test} ${FUZZING_LIBRARY})
+ target_link_libraries (${test} qpid-proton-core ${FUZZING_LIBRARY})
+
if (FUZZ_REGRESSION_TESTS)
# StandaloneFuzzTargetMain cannot walk directory trees
file(GLOB_RECURSE files ${CMAKE_CURRENT_SOURCE_DIR}/${test}/*)
@@ -40,20 +41,14 @@ macro (pn_add_fuzz_test_no_proton test)
else ()
add_test (NAME ${test} COMMAND $<TARGET_FILE:${test}> -runs=1 ${CMAKE_CURRENT_SOURCE_DIR}/${test}>)
endif ()
-endmacro(pn_add_fuzz_test_no_proton)
-
-macro (pn_add_fuzz_test test)
- pn_add_fuzz_test_no_proton (${test} ${ARGN})
- target_link_libraries (${test} qpid-proton-core ${FUZZING_LIBRARY})
-endmacro (pn_add_fuzz_test)
+endmacro(pn_add_fuzz_test)
# Fuzz tests at the User API level
pn_add_fuzz_test (fuzz-connection-driver fuzz-connection-driver.c)
pn_add_fuzz_test (fuzz-message-decode fuzz-message-decode.c)
-# pn_url_parse is not in qpid-proton-core so link with qpid-proton instead
-pn_add_fuzz_test_no_proton (fuzz-url fuzz-url.c)
-target_link_libraries (fuzz-url qpid-proton ${FUZZING_LIBRARY})
+# pn_url_parse is not in proton core and is only used by messenger so compile specially
+pn_add_fuzz_test (fuzz-url fuzz-url.c ${PN_C_SOURCE_DIR}/extra/url.c ${PN_C_SOURCE_DIR}/core/util.c)
# This regression test can take a very long time so don't run by default
if(HAS_PROACTOR AND FUZZ_LONG_TESTS)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org