making the world a little less ugly, one commit at a time.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3026 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 2d55b721c5d39b793acd7a20802cf1beace2fa5f..1606d968ae93346f51b9502acae6dd140562c7fc 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -454,7 +454,7 @@ static switch_status_t show_function(char *cmd, switch_core_session_t *session,
         sprintf (sql, "select type, name from interfaces where type = '%s'", cmd);
     }
     else if (!strcmp(cmd,"application") || !strcmp(cmd,"api")) {
-        sprintf (sql, "select * from interfaces where type = '%s'", cmd);
+        sprintf (sql, "select name, description, syntax from interfaces where type = '%s'", cmd);
     }
     else if ( !strcmp(cmd,"calls")) {
         sprintf (sql, "select * from calls");
@@ -468,9 +468,9 @@ static switch_status_t show_function(char *cmd, switch_core_session_t *session,
                holder.print_title = 0;
                if ((cmdname = strchr(cmd, ' ')) != 0) {
                        *cmdname++ = '\0';
-               sprintf (sql, "select name, description, syntax from interfaces where type = 'api' and name = '%s'", cmdname);
+               sprintf (sql, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname);
                } else {
-               sprintf (sql, "select name, description, syntax from interfaces where type = 'api'");
+               sprintf (sql, "select name, syntax, description from interfaces where type = 'api'");
                }
     }
     else {
@@ -529,7 +529,7 @@ static switch_api_interface_t help_api_interface = {
        /*.interface_name */ "help",
        /*.desc */ "Show help for all the api commands",
        /*.function */ help_function,
-       /*.syntax */ "help",
+       /*.syntax */ "",
        /*.next */ NULL
 };
 
@@ -537,7 +537,7 @@ static switch_api_interface_t ctl_api_interface = {
        /*.interface_name */ "fsctl",
        /*.desc */ "control messages",
        /*.function */ ctl_function,
-       /*.syntax */ "fsctl [hupall|pause|resume|shutdown]",
+       /*.syntax */ "[hupall|pause|resume|shutdown]",
        /*.next */ &help_api_interface
 };
 
@@ -545,7 +545,7 @@ static switch_api_interface_t uuid_bridge_api_interface = {
        /*.interface_name */ "uuid_bridge",
        /*.desc */ "uuid_bridge",
        /*.function */ uuid_bridge_function,
-       /*.syntax */ "uuid_bridge <uuid> <other_uuid>",
+       /*.syntax */ "<uuid> <other_uuid>",
        /*.next */ &ctl_api_interface
 };
 
@@ -553,7 +553,7 @@ static switch_api_interface_t status_api_interface = {
        /*.interface_name */ "status",
        /*.desc */ "status",
        /*.function */ status_function,
-       /*.syntax */ "status",
+       /*.syntax */ "",
        /*.next */ &uuid_bridge_api_interface
 };
 
@@ -561,7 +561,7 @@ static switch_api_interface_t show_api_interface = {
        /*.interface_name */ "show",
        /*.desc */ "Show",
        /*.function */ show_function,
-       /*.syntax */ "show <blank>|codec|application|api|dialplan|file|timer|calls|channels",
+       /*.syntax */ "<blank>|codec|application|api|dialplan|file|timer|calls|channels",
        /*.next */ &status_api_interface
 };
 
@@ -569,7 +569,7 @@ static switch_api_interface_t pause_api_interface = {
        /*.interface_name */ "pause",
        /*.desc */ "Pause",
        /*.function */ pause_function,
-       /*.syntax */ "pause <uuid> <on|off>",
+       /*.syntax */ "<uuid> <on|off>",
        /*.next */ &show_api_interface
 };
 
@@ -577,7 +577,7 @@ static switch_api_interface_t transfer_api_interface = {
        /*.interface_name */ "transfer",
        /*.desc */ "Transfer",
        /*.function */ transfer_function,
-       /*.syntax */ "transfer <uuid> <dest-exten> [<dialplan>] [<context>]",
+       /*.syntax */ "<uuid> <dest-exten> [<dialplan>] [<context>]",
        /*.next */ &pause_api_interface
 };
 
@@ -585,7 +585,7 @@ static switch_api_interface_t load_api_interface = {
        /*.interface_name */ "load",
        /*.desc */ "Load Module",
        /*.function */ load_function,
-       /*.syntax */ "load <mod_name>",
+       /*.syntax */ "<mod_name>",
        /*.next */ &transfer_api_interface
 };
 
@@ -593,7 +593,7 @@ static switch_api_interface_t reload_api_interface = {
        /*.interface_name */ "reloadxml",
        /*.desc */ "Reload XML",
        /*.function */ reload_function,
-       /*.syntax */ "reloadxml",
+       /*.syntax */ "",
        /*.next */ &load_api_interface,
 
 };
@@ -602,7 +602,7 @@ static switch_api_interface_t kill_api_interface = {
        /*.interface_name */ "killchan",
        /*.desc */ "Kill Channel",
        /*.function */ kill_function,
-       /*.syntax */ "killchan <uuid>",
+       /*.syntax */ "<uuid>",
        /*.next */ &reload_api_interface
 };
 
@@ -610,7 +610,7 @@ static switch_api_interface_t originate_api_interface = {
        /*.interface_name */ "originate",
        /*.desc */ "Originate a Call",
        /*.function */ originate_function,
-       /*.syntax */ "originate <call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]",
+       /*.syntax */ "<call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]",
        /*.next */ &kill_api_interface
 };
 

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index d3a493e0930b0d981ba003f2949e7d47a4868fc8..9ccb5031c52b3770e290f816ba3c4922d7858a70 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2647,26 +2647,25 @@ static switch_api_interface_t conf_api_interface = {
        /*.desc */ "Conference",
        /*.function */ conf_function,
        /*.syntax */ 
-               "conference commands\n"
-               "conference list [delim <string>]\n"
-               "conference <confname> list [delim <string>]\n"
-               "conference <confname> energy <member_id> [<newval>]\n"
-               "conference <confname> volume_in <member_id> [<newval>]\n"
-               "conference <confname> volume_out <member_id> [<newval>]\n"
-               "conference <confname> play <file_path> [<member_id>]\n"
-               "conference <confname> say <text>\n"
-               "conference <confname> saymember <member_id><text>\n"
-               "conference <confname> stop <[current|all]> [<member_id>]\n"
-               "conference <confname> kick <member_id>\n"
-               "conference <confname> mute <member_id>\n"
-               "conference <confname> unmute <member_id>\n"
-               "conference <confname> deaf <member_id>\n"
-               "conference <confname> undef <member_id>\n"
-               "conference <confname> relate <member_id> <other_member_id> [nospeak|nohear]\n"
-               "conference <confname> lock\n"
-               "conference <confname> unlock\n"
-               "conference <confname> dial <endpoint_module_name>/<destination>\n"
-               "conference <confname> transfer <member_id> <conference_name>\n",
+               "list [delim <string>]\n"
+               "<confname> list [delim <string>]\n"
+               "<confname> energy <member_id> [<newval>]\n"
+               "<confname> volume_in <member_id> [<newval>]\n"
+               "<confname> volume_out <member_id> [<newval>]\n"
+               "<confname> play <file_path> [<member_id>]\n"
+               "<confname> say <text>\n"
+               "<confname> saymember <member_id><text>\n"
+               "<confname> stop <[current|all]> [<member_id>]\n"
+               "<confname> kick <member_id>\n"
+               "<confname> mute <member_id>\n"
+               "<confname> unmute <member_id>\n"
+               "<confname> deaf <member_id>\n"
+               "<confname> undef <member_id>\n"
+               "<confname> relate <member_id> <other_member_id> [nospeak|nohear]\n"
+               "<confname> lock\n"
+               "<confname> unlock\n"
+               "<confname> dial <endpoint_module_name>/<destination>\n"
+               "<confname> transfer <member_id> <conference_name>",
        /*.next */ 
 };
 

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index f1ae020427d0c0a4a77dbb7ee5d24651b29275a5..188e15972fcc9c35e0c3ce463dc713f274c2f343 100644 (file)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -132,7 +132,7 @@ static switch_api_interface_t dptools_api_interface = {
        /*.interface_name */ "strftime",
        /*.desc */ "strftime",
        /*.function */ strftime_api_function,
-       /*.syntax */ "strftime <format_string>",
+       /*.syntax */ "<format_string>",
        /*.next */ NULL
 };
 
@@ -140,7 +140,7 @@ static const switch_application_interface_t set_application_interface = {
        /*.interface_name */ "set",
        /*.application_function */ set_function,
        /* long_desc */ "Set a channel varaible for the channel calling the application.",
-       /* short_desc */ "Set a channel varaible.",
+       /* short_desc */ "Set a channel varaible",
        /* syntax */ "<varname>=[<value>|_UNDEF_]",
        /*.next */ NULL
 };
@@ -149,7 +149,7 @@ static const switch_application_interface_t answer_application_interface = {
        /*.interface_name */ "answer",
        /*.application_function */ answer_function,
        /* long_desc */ "Answer the call for a channel.",
-       /* short_desc */ "Answer the call.",
+       /* short_desc */ "Answer the call",
        /* syntax */ "",
        /*.next */ &set_application_interface