diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:46:00 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-19 16:46:00 +0200 |
| commit | 3a5d7105589e39b43fe5e9256e8137d7e783141d (patch) | |
| tree | 6a0c9fda7110bbee1213b0d347e11c84a8266875 /src/scanner.c | |
| parent | f1a6c049e615f5739183d2558df9db5bca43cd68 (diff) | |
| parent | 05e2631353c9f9522564ca06efc8fc5ba3a863cb (diff) | |
Merge tag 'upstream/3.17.90'
Upstream version 3.17.90
Diffstat (limited to 'src/scanner.c')
| -rw-r--r-- | src/scanner.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/scanner.c b/src/scanner.c index 2d28a84..38fa7e5 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -4776,7 +4776,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* #line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 4779 "scanner.c" - goto __catch14_g_regex_error; + goto __catch15_g_regex_error; } #line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" 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); @@ -4801,7 +4801,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* #line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 4804 "scanner.c" - goto __catch14_g_regex_error; + goto __catch15_g_regex_error; } #line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); @@ -4827,8 +4827,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* return result; #line 4829 "scanner.c" } - goto __finally14; - __catch14_g_regex_error: + goto __finally15; + __catch15_g_regex_error: { GError* e = NULL; #line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" @@ -4841,7 +4841,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_error_free0 (e); #line 4843 "scanner.c" } - __finally14: + __finally15: #line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi" @@ -12420,7 +12420,7 @@ void scanner_start (Scanner* self) { #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 12414 "scanner.c" - goto __catch15_g_error; + goto __catch16_g_error; } #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala" _tmp2_ = _tmp0_; @@ -12434,8 +12434,8 @@ void scanner_start (Scanner* self) { _g_thread_unref0 (_tmp0_); #line 12427 "scanner.c" } - goto __finally15; - __catch15_g_error: + goto __finally16; + __catch16_g_error: { GError* e = NULL; GError* _tmp3_ = NULL; @@ -12454,7 +12454,7 @@ void scanner_start (Scanner* self) { _g_error_free0 (e); #line 12447 "scanner.c" } - __finally15: + __finally16: #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala" |