projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix lot of warnings
[lcr.git]
/
action.cpp
diff --git
a/action.cpp
b/action.cpp
index
11eafe5
..
d0a1c9f
100644
(file)
--- a/
action.cpp
+++ b/
action.cpp
@@
-393,6
+393,7
@@
void EndpointAppPBX::action_dialing_remote(void)
{
SCPY(dialinginfo.id, e_extdialing);
}
{
SCPY(dialinginfo.id, e_extdialing);
}
+ e_extdialing = e_dialinginfo.id + strlen(e_dialinginfo.id);
/* send setup to remote */
trace_header("ACTION remote (setup)", DIRECTION_NONE);
add_trace("number", NULL, dialinginfo.id);
/* send setup to remote */
trace_header("ACTION remote (setup)", DIRECTION_NONE);
add_trace("number", NULL, dialinginfo.id);
@@
-987,12
+988,12
@@
void EndpointAppPBX::_action_redial_reply(int in)
{
/* find next entry */
e_select++;
{
/* find next entry */
e_select++;
- if (e_select >= MAX_REMEMBER)
+ if (e_select >= MAX_REMEMBER)
{
e_select--;
e_select--;
- else if (in)
+ } else if (in) {
if (e_ext.last_in[e_select][0] == '\0')
e_select--;
if (e_ext.last_in[e_select][0] == '\0')
e_select--;
- else
+
}
else
if (e_ext.last_out[e_select][0] == '\0')
e_select--;
if (e_ext.last_out[e_select][0] == '\0')
e_select--;
@@
-2008,7
+2009,8
@@
void EndpointAppPBX::action_hangup_execute(void)
{
struct route_param *rparam;
pid_t pid;
{
struct route_param *rparam;
pid_t pid;
- char *command = "", isdn_port[10];
+ char *command = (char *)"";
+ char isdn_port[10];
char *argv[11]; /* check also number of args below */
int i = 0;
char *argv[11]; /* check also number of args below */
int i = 0;
@@
-2021,8
+2023,8
@@
void EndpointAppPBX::action_hangup_execute(void)
end_trace();
return;
}
end_trace();
return;
}
- argv[i++] = "/bin/sh";
- argv[i++] = "-c";
+ argv[i++] =
(char *)
"/bin/sh";
+ argv[i++] =
(char *)
"-c";
argv[i++] = command;
argv[i++] = command;
if ((rparam = routeparam(e_action, PARAM_PARAM)))
argv[i++] = command;
argv[i++] = command;
if ((rparam = routeparam(e_action, PARAM_PARAM)))
@@
-2030,7
+2032,7
@@
void EndpointAppPBX::action_hangup_execute(void)
argv[i++] = rparam->string_value;
}
argv[i++] = e_extdialing;
argv[i++] = rparam->string_value;
}
argv[i++] = e_extdialing;
- argv[i++] = numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international);
+ argv[i++] =
(char *)
numberrize_callerinfo(e_callerinfo.id, e_callerinfo.ntype, options.national, options.international);
argv[i++] = e_callerinfo.extension;
argv[i++] = e_callerinfo.name;
SPRINT(isdn_port, "%d", e_callerinfo.isdn_port);
argv[i++] = e_callerinfo.extension;
argv[i++] = e_callerinfo.name;
SPRINT(isdn_port, "%d", e_callerinfo.isdn_port);
@@
-2059,7
+2061,7
@@
void EndpointAppPBX::action_hangup_execute(void)
void EndpointAppPBX::action_hangup_file(void)
{
struct route_param *rparam;
void EndpointAppPBX::action_hangup_file(void)
{
struct route_param *rparam;
- char *file, *content, *mode;
+ c
onst c
har *file, *content, *mode;
FILE *fp;
/* get file / content */
FILE *fp;
/* get file / content */