From 9c713d12dab7f6fc1e3ccd80ac3f4541f9069a2e Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Fri, 23 Aug 2013 22:20:39 +0000
Subject: [PATCH] Fix building of trunk.
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
---
main/bucket.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/main/bucket.c b/main/bucket.c
index 0efd4871c5..fd5b091eaf 100644
--- a/main/bucket.c
+++ b/main/bucket.c
@@ -117,11 +117,11 @@ static void *bucket_wizard_retrieve(const struct ast_sorcery *sorcery, void *dat
#ifdef HAVE_URIPARSER
UriParserStateA state;
UriUriA uri;
+ size_t len;
#else
char *tmp = ast_strdupa(id);
#endif
SCOPED_AO2RDLOCK(lock, schemes);
- size_t len;
char *uri_scheme;
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);
#else
uri_scheme = tmp;
- if (!(tmp = strchr(':'))) {
+ if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL;
}
*tmp = '\0';
@@ -186,10 +186,10 @@ static void *bucket_file_wizard_retrieve(const struct ast_sorcery *sorcery, void
#ifdef HAVE_URIPARSER
UriParserStateA state;
UriUriA uri;
+ size_t len;
#else
char *tmp = ast_strdupa(id);
#endif
- size_t len;
char *uri_scheme;
SCOPED_AO2RDLOCK(lock, schemes);
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);
#else
uri_scheme = tmp;
- if (!(tmp = strchr(':'))) {
+ if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL;
}
*tmp = '\0';
@@ -402,10 +402,10 @@ struct ast_bucket *ast_bucket_alloc(const char *uri)
#ifdef HAVE_URIPARSER
UriParserStateA state;
UriUriA full_uri;
+ size_t len;
#else
char *tmp = ast_strdupa(uri);
#endif
- size_t len;
char *uri_scheme;
RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup);
struct ast_bucket *bucket;
@@ -430,7 +430,7 @@ struct ast_bucket *ast_bucket_alloc(const char *uri)
uriFreeUriMembersA(&full_uri);
#else
uri_scheme = tmp;
- if (!(tmp = strchr(':'))) {
+ if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL;
}
*tmp = '\0';
@@ -628,10 +628,10 @@ struct ast_bucket_file *ast_bucket_file_alloc(const char *uri)
#ifdef HAVE_URIPARSER
UriParserStateA state;
UriUriA full_uri;
+ size_t len;
#else
char *tmp = ast_strdupa(uri);
#endif
- size_t len;
char *uri_scheme;
RAII_VAR(struct ast_bucket_scheme *, scheme, NULL, ao2_cleanup);
struct ast_bucket_file *file;
@@ -656,7 +656,7 @@ struct ast_bucket_file *ast_bucket_file_alloc(const char *uri)
uriFreeUriMembersA(&full_uri);
#else
uri_scheme = tmp;
- if (!(tmp = strchr(':'))) {
+ if (!(tmp = strchr(uri_scheme, ':'))) {
return NULL;
}
*tmp = '\0';
--
GitLab