[Freeswitch-svn] [commit] r3026 - in freeswitch/trunk/src/mod/applications: mod_commands mod_conference mod_dptools
Freeswitch SVN
mikej at freeswitch.org
Tue Oct 10 08:00:24 EDT 2006
Author: mikej
Date: Tue Oct 10 08:00:22 2006
New Revision: 3026
Modified:
freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
Log:
making the world a little less ugly, one commit at a time.
Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 10 08:00:22 2006
@@ -454,7 +454,7 @@
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 @@
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 @@
/*.interface_name */ "help",
/*.desc */ "Show help for all the api commands",
/*.function */ help_function,
- /*.syntax */ "help",
+ /*.syntax */ "",
/*.next */ NULL
};
@@ -537,7 +537,7 @@
/*.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 @@
/*.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 @@
/*.interface_name */ "status",
/*.desc */ "status",
/*.function */ status_function,
- /*.syntax */ "status",
+ /*.syntax */ "",
/*.next */ &uuid_bridge_api_interface
};
@@ -561,7 +561,7 @@
/*.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 @@
/*.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 @@
/*.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 @@
/*.interface_name */ "load",
/*.desc */ "Load Module",
/*.function */ load_function,
- /*.syntax */ "load <mod_name>",
+ /*.syntax */ "<mod_name>",
/*.next */ &transfer_api_interface
};
@@ -593,7 +593,7 @@
/*.interface_name */ "reloadxml",
/*.desc */ "Reload XML",
/*.function */ reload_function,
- /*.syntax */ "reloadxml",
+ /*.syntax */ "",
/*.next */ &load_api_interface,
};
@@ -602,7 +602,7 @@
/*.interface_name */ "killchan",
/*.desc */ "Kill Channel",
/*.function */ kill_function,
- /*.syntax */ "killchan <uuid>",
+ /*.syntax */ "<uuid>",
/*.next */ &reload_api_interface
};
@@ -610,7 +610,7 @@
/*.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
};
Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Oct 10 08:00:22 2006
@@ -2647,26 +2647,25 @@
/*.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 */
};
Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Oct 10 08:00:22 2006
@@ -132,7 +132,7 @@
/*.interface_name */ "strftime",
/*.desc */ "strftime",
/*.function */ strftime_api_function,
- /*.syntax */ "strftime <format_string>",
+ /*.syntax */ "<format_string>",
/*.next */ NULL
};
@@ -140,7 +140,7 @@
/*.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 @@
/*.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
More information about the Freeswitch-svn
mailing list