summaryrefslogtreecommitdiff
path: root/src/scanner.c
diff options
context:
space:
mode:
authorAlessio Treglia <alessio@debian.org>2011-09-03 12:12:54 +0200
committerAlessio Treglia <alessio@debian.org>2011-09-03 12:12:54 +0200
commita25eb08be6af9cc6580f9731a1e515be120331fc (patch)
treed28f304fa76bb0175ae1d887cf4c4b27d8ac29ec /src/scanner.c
parent5c8211aeb400deaf51d30eddd0c92017db7b4422 (diff)
parent8227fe5bd1a0cee50359c2581184c32a371c754e (diff)
Merge commit 'upstream/3.1.90'
Diffstat (limited to 'src/scanner.c')
-rw-r--r--src/scanner.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/scanner.c b/src/scanner.c
index e7e83cc..c26d691 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -3293,7 +3293,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
regex = _tmp3_;
if (_inner_error_ != NULL) {
if (_inner_error_->domain == G_REGEX_ERROR) {
- goto __catch8_g_regex_error;
+ goto __catch9_g_regex_error;
}
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
@@ -3304,7 +3304,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if (_inner_error_ != NULL) {
_g_regex_unref0 (regex);
if (_inner_error_->domain == G_REGEX_ERROR) {
- goto __catch8_g_regex_error;
+ goto __catch9_g_regex_error;
}
_g_regex_unref0 (regex);
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3315,8 +3315,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
return result;
}
- goto __finally8;
- __catch8_g_regex_error:
+ goto __finally9;
+ __catch9_g_regex_error:
{
GError* e = NULL;
e = _inner_error_;
@@ -3324,7 +3324,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_assert_not_reached ();
_g_error_free0 (e);
}
- __finally8:
+ __finally9:
if (_inner_error_ != NULL) {
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
@@ -5634,12 +5634,12 @@ void scanner_start (Scanner* self) {
_tmp0_ = g_thread_create (_scanner_scan_thread_gthread_func, self, TRUE, &_inner_error_);
_tmp1_ = _tmp0_;
if (_inner_error_ != NULL) {
- goto __catch9_g_error;
+ goto __catch10_g_error;
}
self->priv->thread = _tmp1_;
}
- goto __finally9;
- __catch9_g_error:
+ goto __finally10;
+ __catch10_g_error:
{
GError* e = NULL;
e = _inner_error_;
@@ -5647,7 +5647,7 @@ void scanner_start (Scanner* self) {
g_critical ("scanner.vala:1384: Unable to create thread: %s", e->message);
_g_error_free0 (e);
}
- __finally9:
+ __finally10:
if (_inner_error_ != NULL) {
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);