[asterisk-commits] rmudgett: trunk r378790 - in /trunk: include/asterisk/test.h main/test.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan  9 15:14:39 2013
New Revision: 378790

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378790
Log:
* Whitespace changes.

* Made ast_test_init() match its prototype.

Modified:
    trunk/include/asterisk/test.h
    trunk/main/test.c

Modified: trunk/include/asterisk/test.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/test.h?view=diff&rev=378790&r1=378789&r2=378790
==============================================================================
--- trunk/include/asterisk/test.h (original)
+++ trunk/include/asterisk/test.h Wed Jan  9 15:14:39 2013
@@ -35,7 +35,7 @@
 #include "asterisk/strings.h"
 #endif
 
-/*! 
+/*!
 
 \page AstUnitTestAPI Asterisk Unit Test API
 
@@ -57,7 +57,7 @@
 
 \code
    AST_TEST_DEFINE(sample_test_cb) \\The name of the callback function
-   {                               \\The the function's body 
+   {                               \\The the function's body
       switch (cmd) {
       case TEST_INIT:
           info->name = "sample_test";
@@ -86,7 +86,7 @@
       Details of the test execution, especially failure details, should be provided
       by using the ast_test_status_update() function.
 
-\subsection RegisterTest Register a Test 
+\subsection RegisterTest Register a Test
 
    Register the test using the AST_TEST_REGISTER macro.
 
@@ -148,9 +148,8 @@
  * \returns 0 on success
  * \returns any other value on failure
  */
-int __ast_test_suite_event_notify(const char *file, const char *func, int line,
-		const char *state, const char *fmt, ...)
-		__attribute__((format(printf, 5, 6)));
+int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...)
+	__attribute__((format(printf, 5, 6)));
 
 /*!
  * \brief Notifies the test suite of a failed assert on an expression
@@ -165,8 +164,7 @@
  * \returns 0 on success
  * \returns any other value on failure
  */
-int __ast_test_suite_assert_notify(const char *file, const char *func, int line,
-		const char *exp);
+int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp);
 
 /*!
  * \ref __ast_test_suite_event_notify()
@@ -234,7 +232,7 @@
  * \retval AST_TEST_FAIL for failure
  */
 typedef enum ast_test_result_state (ast_test_cb_t)(struct ast_test_info *info,
-		enum ast_test_command cmd, struct ast_test *test);
+	enum ast_test_command cmd, struct ast_test *test);
 
 /*!
  * \brief unregisters a test with the test framework
@@ -275,9 +273,8 @@
  * \retval 0 success
  * \retval -1 failure
  */
-int __ast_test_status_update(const char *file, const char *func, int line,
-		struct ast_test *test, const char *fmt, ...)
-		__attribute__((format(printf, 5, 6)));
+int __ast_test_status_update(const char *file, const char *func, int line, struct ast_test *test, const char *fmt, ...)
+	__attribute__((format(printf, 5, 6)));
 
 /*!
  * \ref __ast_test_status_update()

Modified: trunk/main/test.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/test.c?view=diff&rev=378790&r1=378789&r2=378790
==============================================================================
--- trunk/main/test.c (original)
+++ trunk/main/test.c Wed Jan  9 15:14:39 2013
@@ -121,8 +121,7 @@
 	ast_free(buf);
 }
 
-int __ast_test_status_update(const char *file, const char *func, int line,
-		struct ast_test *test, const char *fmt, ...)
+int __ast_test_status_update(const char *file, const char *func, int line, struct ast_test *test, const char *fmt, ...)
 {
 	struct ast_str *buf = NULL;
 	va_list ap;
@@ -911,8 +910,7 @@
 	AST_CLI_DEFINE(test_cli_generate_results,          "generate test results to file"),
 };
 
-int __ast_test_suite_event_notify(const char *file, const char *func, int line,
-		const char *state, const char *fmt, ...)
+int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...)
 {
 	struct ast_str *buf = NULL;
 	va_list ap;
@@ -930,7 +928,8 @@
 		"State: %s\r\n"
 		"AppFile: %s\r\n"
 		"AppFunction: %s\r\n"
-		"AppLine: %d\r\n%s\r\n",
+		"AppLine: %d\r\n"
+		"%s\r\n",
 		state, file, func, line, ast_str_buffer(buf));
 
 	ast_free(buf);
@@ -938,8 +937,7 @@
 	return 0;
 }
 
-int __ast_test_suite_assert_notify(const char *file, const char *func, int line,
-		const char *exp)
+int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp)
 {
 	manager_event(EVENT_FLAG_TEST, "TestEvent",
 		"Type: Assert\r\n"
@@ -954,7 +952,7 @@
 
 #endif /* TEST_FRAMEWORK */
 
-int ast_test_init()
+int ast_test_init(void)
 {
 #ifdef TEST_FRAMEWORK
 	/* Register cli commands */