kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 09:58:17 +00:00
Code Issues Projects Releases Wiki Activity

cleanup, null checks. etc.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6673 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2007-12-11 21:31:57 +00:00
parent 21db9795d0
commit e46266fb4f
8 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_utils.c
View File

@@ -45,7 +45,7 @@ SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char clos
s++;
}
if (*s == open) {
if (s && *s == open) {
depth++;
for (e = s + 1; e && *e; e++) {
if (*e == open) {
@@ -266,11 +266,11 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *fr
}
if (file) {
const char *filename = switch_cut_path(file);
const char *stipped_file = switch_cut_path(file);
const char *new_type;
char *ext;
if ((ext = strrchr(filename, '.'))) {
if ((ext = strrchr(stipped_file, '.'))) {
ext++;
if ((new_type = switch_core_mime_ext2type(ext))) {
mime_type = new_type;
@@ -283,7 +283,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *fr
"Content-Transfer-Encoding: base64\n"
"Content-Description: Sound attachment.\n"
"Content-Disposition: attachment; filename=\"%s\"\n\n",
bound, mime_type, filename, filename);
bound, mime_type, stipped_file, stipped_file);
if (!write_buf(fd, buf))
return SWITCH_FALSE;
@@ -379,6 +379,11 @@ SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip)
SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len)
{
char *p = pat;
if (!pat) {
return SWITCH_FALSE;
}
memset(rbuf, 0, len);
*(rbuf + strlen(rbuf)) = '^';
@@ -1101,6 +1106,7 @@ SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *sea
char *dest, *tmp;
dest = (char *) malloc(sizeof(char));
switch_assert(dest);
for (i = 0; i < string_len; i++) {
if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) {