# HG changeset patch # User Sebastien Decugis # Date 1370015256 -7200 # Node ID 5b930daeb4c13a4ccfa5a8113ca1c0e533348716 # Parent 515a5b8f930aee7eb02ebf8577b3e22f8c691ffb# Parent 6df90573cf57245388bc164e76c2f9788f6ffffa Merged diff -r 515a5b8f930a -r 5b930daeb4c1 libfdcore/hooks.c --- a/libfdcore/hooks.c Fri May 31 17:46:02 2013 +0200 +++ b/libfdcore/hooks.c Fri May 31 17:47:36 2013 +0200 @@ -358,7 +358,8 @@ CHECK_MALLOC_DO(fd_msg_dump_treeview(&buf, &len, NULL, msg, NULL, 0, 1), break); - LOG_E("Parsing error: '%s' for the following message received from '%s':\n%s", (char *)other, (char *)id, buf); + LOG_E("Parsing error: '%s' for the following message received from '%s':", (char *)other, (char *)id); + LOG_E("%s", buf); } else { struct fd_cnx_rcvdata *rcv_data = other; CHECK_MALLOC_DO(fd_dump_extend_hexdump(&buf, &len, NULL, rcv_data->buffer, rcv_data->length, 0, 0), break); @@ -377,7 +378,8 @@ CHECK_MALLOC_DO(fd_msg_dump_treeview(&buf, &len, NULL, msg, NULL, 0, 1), break); - LOG_E("Routing error: '%s' for the following message:\n%s", (char *)other, buf); + LOG_E("Routing error: '%s' for the following message:", (char *)other); + LOG_E("%s", buf); break; } @@ -395,7 +397,8 @@ case HOOK_MESSAGE_DROPPED: { CHECK_MALLOC_DO(fd_msg_dump_treeview(&buf, &len, NULL, msg, NULL, 0, 1), break); - LOG_E("Message discarded ('%s'):\n%s", (char *)other, buf); + LOG_E("Message discarded ('%s'):", (char *)other); + LOG_E("%s", buf); break; } diff -r 515a5b8f930a -r 5b930daeb4c1 libfdcore/version.c --- a/libfdcore/version.c Fri May 31 17:46:02 2013 +0200 +++ b/libfdcore/version.c Fri May 31 17:47:36 2013 +0200 @@ -37,11 +37,11 @@ #include #ifdef FD_PROJECT_VERSION_HG -# define VERSION \ +# define FD_LIBFDCORE_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) "-" FD_PROJECT_VERSION_HG_VAL #else -# define VERSION \ +# define FD_LIBFDCORE_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) #endif -const char fd_core_version[] = VERSION; +const char fd_core_version[] = FD_LIBFDCORE_VERSION; diff -r 515a5b8f930a -r 5b930daeb4c1 libfdproto/version.c --- a/libfdproto/version.c Fri May 31 17:46:02 2013 +0200 +++ b/libfdproto/version.c Fri May 31 17:47:36 2013 +0200 @@ -37,11 +37,11 @@ #include #ifdef FD_PROJECT_VERSION_HG -# define VERSION \ +# define FD_LIBFDPROTO_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) "-" FD_PROJECT_VERSION_HG_VAL #else -# define VERSION \ +# define FD_LIBFDPROTO_VERSION \ _stringize(FD_PROJECT_VERSION_MAJOR) "." _stringize(FD_PROJECT_VERSION_MINOR) "." _stringize(FD_PROJECT_VERSION_REV) #endif -const char fd_libproto_version[] = VERSION; +const char fd_libproto_version[] = FD_LIBFDPROTO_VERSION; diff -r 515a5b8f930a -r 5b930daeb4c1 tests/testsess.c --- a/tests/testsess.c Fri May 31 17:46:02 2013 +0200 +++ b/tests/testsess.c Fri May 31 17:47:36 2013 +0200 @@ -111,8 +111,8 @@ CHECK( 1, testptr == NULL ? 1 : 0 ); CHECK( 0, fd_sess_handler_create ( &hdl2, mycleanup, NULL, g_opaque ) ); #if 0 - fd_log_debug("%s\n", fd_sess_dump_hdl(FD_DUMP_TEST_PARAMS, hdl1)); - fd_log_debug("%s\n", fd_sess_dump_hdl(FD_DUMP_TEST_PARAMS, hdl2)); + fd_log_debug("%s", fd_sess_dump_hdl(FD_DUMP_TEST_PARAMS, hdl1)); + fd_log_debug("%s", fd_sess_dump_hdl(FD_DUMP_TEST_PARAMS, hdl2)); #endif } @@ -122,8 +122,8 @@ CHECK( 0, fd_sess_new( &sess1, TEST_DIAM_ID, CONSTSTRLEN(TEST_DIAM_ID), NULL, 0 ) ); CHECK( 0, fd_sess_new( &sess2, TEST_DIAM_ID, CONSTSTRLEN(TEST_DIAM_ID), NULL, 0 ) ); #if 0 - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); #endif /* Check both string start with the diameter Id, but are different */ @@ -140,8 +140,8 @@ CHECK( 0, fd_sess_new( &sess1, TEST_DIAM_ID, 0, TEST_OPT, 0 ) ); CHECK( 0, fd_sess_new( &sess2, TEST_DIAM_ID, CONSTSTRLEN(TEST_DIAM_ID), TEST_OPT, CONSTSTRLEN(TEST_OPT_IN) - 1 ) ); #if 0 - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); #endif CHECK( 0, fd_sess_getsid(sess1, &str1, &str1len) ); @@ -164,8 +164,8 @@ CHECK( sess3, sess1 ); CHECK( 0, fd_sess_new( &sess2, NULL, 0, TEST_SID, CONSTSTRLEN(TEST_SID_IN) - 1 ) ); #if 0 - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); #endif CHECK( 0, fd_sess_getsid(sess1, &str1, &str1len) ); CHECK( 0, fd_sess_getsid(sess2, &str2, &str2len) ); @@ -294,7 +294,7 @@ CHECK( 1, ms[1] ? 1 : 0 ); #if 0 - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); #endif CHECK( 0, fd_sess_state_retrieve( hdl1, sess1, &ms[0] ) ); @@ -331,9 +331,9 @@ CHECK( 0, fd_sess_state_store ( hdl2, sess3, &ms[5] ) ); #if 0 - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess3, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess3, 1)); #endif /* Destroy session 3 */ @@ -356,8 +356,8 @@ CHECK( 1, testptr == g_opaque ? 1 : 0 ); #if 1 - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); #endif /* Create again session 3, check that no data is associated to it */ @@ -372,8 +372,8 @@ CHECK( 0, clock_gettime(CLOCK_REALTIME, &timeout) ); CHECK( 0, fd_sess_settimeout( sess2, &timeout) ); #if 1 - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); - fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); + fd_log_debug("%s", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); #endif timeout.tv_sec = 0; timeout.tv_nsec= 50000000; /* 50 ms */