[svn-commits] trunk r35502 - /trunk/manager.c

[svn-commits at lists.digium.com]

Author: oej
Date: Thu Jun 22 10:34:20 2006
New Revision: 35502

URL: http://svn.digium.com/view/asterisk?rev=35502&view=rev
Log:
Formatting fixes

Modified:
    trunk/manager.c

Modified: trunk/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/manager.c?rev=35502&r1=35501&r2=35502&view=diff
==============================================================================
--- trunk/manager.c (original)
+++ trunk/manager.c Thu Jun 22 10:34:20 2006
@@ -169,7 +169,7 @@
 static struct manager_action *first_action = NULL;
 AST_MUTEX_DEFINE_STATIC(actionlock);
 
-/*! authority_to_str: Convert authority code to string with serveral options */
+/*! \brief Convert authority code to string with serveral options */
 static char *authority_to_str(int authority, char *res, int reslen)
 {
 	int running_total = 0, i;
@@ -418,8 +418,8 @@
 	return RESULT_SUCCESS;
 }
 
-/*! \brief  handle_showmancmds: CLI command */
-/* Should change to "manager show commands" */
+/*! \brief  CLI command 
+	Should change to "manager show commands" */
 static int handle_showmancmds(int fd, int argc, char *argv[])
 {
 	struct manager_action *cur = first_action;
@@ -438,7 +438,7 @@
 	return RESULT_SUCCESS;
 }
 
-/*! \brief  handle_showmanconn: CLI command show manager connected */
+/*! \brief CLI command show manager connected */
 /* Should change to "manager show connected" */
 static int handle_showmanconn(int fd, int argc, char *argv[])
 {
@@ -457,7 +457,7 @@
 	return RESULT_SUCCESS;
 }
 
-/*! \brief  handle_showmanconn: CLI command show manager connected */
+/*! \brief CLI command show manager connected */
 /* Should change to "manager show connected" */
 static int handle_showmaneventq(int fd, int argc, char *argv[])
 {
@@ -613,7 +613,7 @@
 	return head;
 }
 
-/*! NOTE:
+/*! \note NOTE:
    Callers of astman_send_error(), astman_send_response() or astman_send_ack() must EITHER
    hold the session lock _or_ be running in an action callback (in which case s->busy will
    be non-zero). In either of these cases, there is no need to lock-protect the session's
@@ -730,11 +730,10 @@
 	return ret;
 }
 
-/*! 
+/*! \brief
    Rather than braindead on,off this now can also accept a specific int mask value 
    or a ',' delim list of mask strings (the same as manager.conf) -anthm
 */
-
 static int set_eventmask(struct mansession *s, char *eventmask)
 {
 	int maskint = ast_strings_to_mask(eventmask);
@@ -847,7 +846,7 @@
 	return -1;
 }
 
-/*! \brief PING: Manager PING */
+/*! \brief Manager PING */
 static char mandescr_ping[] = 
 "Description: A 'Ping' action will ellicit a 'Pong' response.  Used to keep the\n"
 "  manager connection open.\n"
@@ -859,7 +858,7 @@
 	return 0;
 }
 
-/*! \brief WAITEVENT: Manager WAITEVENT */
+/*! \brief Manager WAITEVENT */
 static char mandescr_waitevent[] = 
 "Description: A 'WaitEvent' action will ellicit a 'Success' response.  Whenever\n"
 "a manager event is queued.  Once WaitEvent has been called on an HTTP manager\n"
@@ -1123,7 +1122,7 @@
 }
 
 
-/*! \brief  action_status: Manager "status" command to show channels */
+/*! \brief Manager "status" command to show channels */
 /* Needs documentation... */
 static int action_status(struct mansession *s, struct message *m)
 {
@@ -1465,7 +1464,7 @@
 	return 0;
 }
 
-/*! 	\brief Help text for manager command mailboxstatus
+/*! \brief Help text for manager command mailboxstatus
  */
 static char mandescr_mailboxstatus[] = 
 "Description: Checks a voicemail account for status.\n"
@@ -2442,9 +2441,8 @@
 		httptimeout = newhttptimeout;
 
 	/* If not enabled, do nothing */
-	if (!enabled) {
-		return 0;
-	}
+	if (!enabled)
+		return 0;
 
 	if (asock < 0) {
 		asock = socket(AF_INET, SOCK_STREAM, 0);