[asterisk-commits] file: trunk r397613 - /trunk/main/bucket.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Aug 23 17:20:39 2013
New Revision: 397613

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397613
Log:
Fix building of trunk.

Note: This is why I commit on the weekend.

Modified:
    trunk/main/bucket.c

Modified: trunk/main/bucket.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bucket.c?view=diff&rev=397613&r1=397612&r2=397613
==============================================================================
--- trunk/main/bucket.c (original)
+++ trunk/main/bucket.c Fri Aug 23 17:20:39 2013
@@ -117,11 +117,11 @@
 #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 @@
 	uriFreeUriMembersA(&uri);
 #else
 	uri_scheme = tmp;
-	if (!(tmp = strchr(':'))) {
+	if (!(tmp = strchr(uri_scheme, ':'))) {
 		return NULL;
 	}
 	*tmp = '\0';
@@ -186,10 +186,10 @@
 #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 @@
 	uriFreeUriMembersA(&uri);
 #else
 	uri_scheme = tmp;
-	if (!(tmp = strchr(':'))) {
+	if (!(tmp = strchr(uri_scheme, ':'))) {
 		return NULL;
 	}
 	*tmp = '\0';
@@ -402,10 +402,10 @@
 #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 @@
 	uriFreeUriMembersA(&full_uri);
 #else
 	uri_scheme = tmp;
-	if (!(tmp = strchr(':'))) {
+	if (!(tmp = strchr(uri_scheme, ':'))) {
 		return NULL;
 	}
 	*tmp = '\0';
@@ -628,10 +628,10 @@
 #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 @@
 	uriFreeUriMembersA(&full_uri);
 #else
 	uri_scheme = tmp;
-	if (!(tmp = strchr(':'))) {
+	if (!(tmp = strchr(uri_scheme, ':'))) {
 		return NULL;
 	}
 	*tmp = '\0';