kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building of trunk.

Browse Source 
Note: This is why I commit on the weekend.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2013-08-23 22:20:39 +00:00
parent f4bf1823e9
commit 9c713d12da
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/bucket.c
View File

@@ -117,11 +117,11 @@ static void *bucket_wizard_retrieve(const struct ast_sorcery *sorcery, void *dat
#ifdef HAVE_URIPARSER #ifdef HAVE_URIPARSER
UriParserStateA state; UriParserStateA state;
UriUriA uri; UriUriA uri;
size_t len;
#else #else
char *tmp = ast_strdupa(id); char *tmp = ast_strdupa(id);
#endif #endif
SCOPED_AO2RDLOCK(lock, schemes); SCOPED_AO2RDLOCK(lock, schemes);
size_t len;
char *uri_scheme; char *uri_scheme;
RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup); RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup);
@@ -140,7 +140,7 @@ static void *bucket_wizard_retrieve(const struct ast_sorcery *sorcery, void *dat
uriFreeUriMembersA(&uri); uriFreeUriMembersA(&uri);
#else #else
uri_scheme = tmp; uri_scheme = tmp;
if (!(tmp = strchr(':'))) { if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL; return NULL;
} }
*tmp = '\0'; *tmp = '\0';
@@ -186,10 +186,10 @@ static void *bucket_file_wizard_retrieve(const struct ast_sorcery *sorcery, void
#ifdef HAVE_URIPARSER #ifdef HAVE_URIPARSER
UriParserStateA state; UriParserStateA state;
UriUriA uri; UriUriA uri;
size_t len;
#else #else
char *tmp = ast_strdupa(id); char *tmp = ast_strdupa(id);
#endif #endif
size_t len;
char *uri_scheme; char *uri_scheme;
SCOPED_AO2RDLOCK(lock, schemes); SCOPED_AO2RDLOCK(lock, schemes);
RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup); RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup);
@@ -209,7 +209,7 @@ static void *bucket_file_wizard_retrieve(const struct ast_sorcery *sorcery, void
uriFreeUriMembersA(&uri); uriFreeUriMembersA(&uri);
#else #else
uri_scheme = tmp; uri_scheme = tmp;
if (!(tmp = strchr(':'))) { if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL; return NULL;
} }
*tmp = '\0'; *tmp = '\0';
@@ -402,10 +402,10 @@ struct ast_bucket *ast_bucket_alloc(const char *uri)
#ifdef HAVE_URIPARSER #ifdef HAVE_URIPARSER
UriParserStateA state; UriParserStateA state;
UriUriA full_uri; UriUriA full_uri;
size_t len;
#else #else
char *tmp = ast_strdupa(uri); char *tmp = ast_strdupa(uri);
#endif #endif
size_t len;
char *uri_scheme; char *uri_scheme;
RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup); RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup);
struct ast_bucket *bucket; struct ast_bucket *bucket;
@@ -430,7 +430,7 @@ struct ast_bucket *ast_bucket_alloc(const char *uri)
uriFreeUriMembersA(&full_uri); uriFreeUriMembersA(&full_uri);
#else #else
uri_scheme = tmp; uri_scheme = tmp;
if (!(tmp = strchr(':'))) { if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL; return NULL;
} }
*tmp = '\0'; *tmp = '\0';
@@ -628,10 +628,10 @@ struct ast_bucket_file *ast_bucket_file_alloc(const char *uri)
#ifdef HAVE_URIPARSER #ifdef HAVE_URIPARSER
UriParserStateA state; UriParserStateA state;
UriUriA full_uri; UriUriA full_uri;
size_t len;
#else #else
char *tmp = ast_strdupa(uri); char *tmp = ast_strdupa(uri);
#endif #endif
size_t len;
char *uri_scheme; char *uri_scheme;
RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup); RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup);
struct ast_bucket_file *file; struct ast_bucket_file *file;
@@ -656,7 +656,7 @@ struct ast_bucket_file *ast_bucket_file_alloc(const char *uri)
uriFreeUriMembersA(&full_uri); uriFreeUriMembersA(&full_uri);
#else #else
uri_scheme = tmp; uri_scheme = tmp;
if (!(tmp = strchr(':'))) { if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL; return NULL;
} }
*tmp = '\0'; *tmp = '\0';