summaryrefslogtreecommitdiff
path: root/src/util/string.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/util/string.c
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/util/string.c')
-rw-r--r--src/util/string.c884
1 files changed, 442 insertions, 442 deletions
diff --git a/src/util/string.c b/src/util/string.c
index ee1a1bb..642e9fa 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.34.7, the Vala compiler
+/* string.c generated by valac 0.36.6, the Vala compiler
* generated from string.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -37,7 +37,7 @@ gint utf8_cs_compare (void* a, void* b);
gint utf8_ci_compare (void* a, void* b);
gchar* uchar_array_to_string (guchar* data, int data_length1, gint length);
guchar* string_to_uchar_array (const gchar* str, int* result_length1);
-static void _vala_array_add1 (guchar** array, int* length, int* size, guchar value);
+static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value);
gchar* guarded_markup_escape_text (const gchar* plain);
glong find_last_offset (const gchar* str, gchar c);
gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1);
@@ -65,17 +65,17 @@ gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const
static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
- glong _tmp0_ = 0L;
- gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp0_;
+ gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 81 "string.c"
}
@@ -84,7 +84,7 @@ static gchar string_get (const gchar* self, glong index) {
inline gboolean is_string_empty (const gchar* s) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_ = NULL;
+ const gchar* _tmp1_;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = s;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -93,8 +93,8 @@ inline gboolean is_string_empty (const gchar* s) {
_tmp0_ = TRUE;
#line 95 "string.c"
} else {
- const gchar* _tmp2_ = NULL;
- gchar _tmp3_ = '\0';
+ const gchar* _tmp2_;
+ gchar _tmp3_;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = s;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -113,9 +113,9 @@ inline gboolean is_string_empty (const gchar* s) {
gint utf8_cs_compare (void* a, void* b) {
gint result = 0;
- void* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ void* _tmp0_;
+ void* _tmp1_;
+ gint _tmp2_;
#line 17 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 17 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -132,14 +132,14 @@ gint utf8_cs_compare (void* a, void* b) {
gint utf8_ci_compare (void* a, void* b) {
gint result = 0;
- void* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- void* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+ void* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ void* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
#line 22 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 22 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -170,19 +170,19 @@ gint utf8_ci_compare (void* a, void* b) {
gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
gchar* result = NULL;
- gint _tmp0_ = 0;
+ gint _tmp0_;
GString* builder = NULL;
- GString* _tmp2_ = NULL;
- GString* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+ GString* _tmp2_;
+ GString* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
#line 27 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = length;
#line 27 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp0_ < 0) {
#line 184 "string.c"
- guchar* _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
+ guchar* _tmp1_;
+ gint _tmp1__length1;
#line 28 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = data;
#line 28 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -208,16 +208,16 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 211 "string.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- guchar* _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- gint _tmp8_ = 0;
- guchar _tmp9_ = '\0';
+ gint _tmp5_;
+ gint _tmp6_;
+ guchar* _tmp7_;
+ gint _tmp7__length1;
+ gint _tmp8_;
+ guchar _tmp9_;
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp3_) {
#line 220 "string.c"
- gint _tmp4_ = 0;
+ gint _tmp4_;
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = ctr;
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -247,11 +247,11 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
#line 32 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp9_ != ((guchar) '\0')) {
#line 250 "string.c"
- GString* _tmp10_ = NULL;
- guchar* _tmp11_ = NULL;
- gint _tmp11__length1 = 0;
- gint _tmp12_ = 0;
- guchar _tmp13_ = '\0';
+ GString* _tmp10_;
+ guchar* _tmp11_;
+ gint _tmp11__length1;
+ gint _tmp12_;
+ guchar _tmp13_;
#line 33 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp10_ = builder;
#line 33 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -289,7 +289,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
}
-static void _vala_array_add1 (guchar** array, int* length, int* size, guchar value) {
+static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value) {
#line 45 "/home/jens/Source/shotwell/src/util/string.vala"
if ((*length) == (*size)) {
#line 45 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -307,11 +307,11 @@ static void _vala_array_add1 (guchar** array, int* length, int* size, guchar val
guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
guchar* result = NULL;
guchar* data = NULL;
- guchar* _tmp0_ = NULL;
- gint data_length1 = 0;
- gint _data_size_ = 0;
- guchar* _tmp11_ = NULL;
- gint _tmp11__length1 = 0;
+ guchar* _tmp0_;
+ gint data_length1;
+ gint _data_size_;
+ guchar* _tmp11_;
+ gint _tmp11__length1;
#line 42 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 43 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -335,19 +335,19 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 338 "string.c"
- gint _tmp3_ = 0;
- const gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- guchar* _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- const gchar* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gchar _tmp10_ = '\0';
+ gint _tmp3_;
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ guchar* _tmp7_;
+ gint _tmp7__length1;
+ const gchar* _tmp8_;
+ gint _tmp9_;
+ gchar _tmp10_;
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp1_) {
#line 350 "string.c"
- gint _tmp2_ = 0;
+ gint _tmp2_;
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = ctr;
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -408,8 +408,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ const gchar* _tmp2_;
+ gboolean _tmp3_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = plain;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -417,8 +417,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp3_) {
#line 420 "string.c"
- const gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ const gchar* _tmp4_;
+ gboolean _tmp5_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = plain;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -434,8 +434,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp1_) {
#line 437 "string.c"
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp6_ = plain;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -446,7 +446,7 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
_tmp0_ = _tmp7_;
#line 448 "string.c"
} else {
- gchar* _tmp8_ = NULL;
+ gchar* _tmp8_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp8_ = g_strdup ("");
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -466,9 +466,9 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
glong find_last_offset (const gchar* str, gchar c) {
glong result = 0L;
glong offset = 0L;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 61 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, 0L);
#line 62 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -482,12 +482,12 @@ glong find_last_offset (const gchar* str, gchar c) {
#line 63 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 485 "string.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- const gchar* _tmp5_ = NULL;
- glong _tmp6_ = 0L;
- gchar _tmp7_ = '\0';
- gchar _tmp8_ = '\0';
+ glong _tmp3_;
+ glong _tmp4_;
+ const gchar* _tmp5_;
+ glong _tmp6_;
+ gchar _tmp7_;
+ gchar _tmp8_;
#line 63 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp3_ = offset;
#line 63 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -528,10 +528,10 @@ glong find_last_offset (const gchar* str, gchar c) {
gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) {
gboolean result = FALSE;
gchar* strdown = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar** _tmp2_;
+ gint _tmp2__length1;
#line 73 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, FALSE);
#line 74 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -557,7 +557,7 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
#line 75 "/home/jens/Source/shotwell/src/util/string.vala"
for (str_element_it = 0; str_element_it < _tmp2__length1; str_element_it = str_element_it + 1) {
#line 560 "string.c"
- gchar* _tmp3_ = NULL;
+ gchar* _tmp3_;
gchar* str_element = NULL;
#line 75 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp3_ = g_strdup (str_element_collection[str_element_it]);
@@ -565,8 +565,8 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
str_element = _tmp3_;
#line 567 "string.c"
{
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
#line 76 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = strdown;
#line 76 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -617,11 +617,11 @@ gchar* guess_convert (const gchar* text) {
gsize bytes_read = 0UL;
const gchar* charset = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- gsize _tmp30_ = 0UL;
- const gchar* _tmp31_ = NULL;
- gint _tmp32_ = 0;
- gint _tmp33_ = 0;
+ gboolean _tmp1_;
+ gsize _tmp30_;
+ const gchar* _tmp31_;
+ gint _tmp32_;
+ gint _tmp33_;
GError * _inner_error_ = NULL;
#line 94 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (text != NULL, NULL);
@@ -641,16 +641,16 @@ gchar* guess_convert (const gchar* text) {
#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp1_) {
#line 643 "string.c"
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
gsize _tmp6_ = 0UL;
- gchar* _tmp7_ = NULL;
- gsize _tmp8_ = 0UL;
- const gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ gchar* _tmp7_;
+ gsize _tmp8_;
+ const gchar* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = text;
#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -678,7 +678,7 @@ gchar* guess_convert (const gchar* text) {
#line 103 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp8_ == ((gsize) _tmp11_)) {
#line 680 "string.c"
- const gchar* _tmp12_ = NULL;
+ const gchar* _tmp12_;
#line 104 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp12_ = charset;
#line 104 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -692,13 +692,13 @@ gchar* guess_convert (const gchar* text) {
}
{
gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
+ const gchar* _tmp14_;
+ const gchar* _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
gsize _tmp18_ = 0UL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp14_ = text;
#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -748,7 +748,7 @@ gchar* guess_convert (const gchar* text) {
__catch6_g_convert_error:
{
GError* _error_ = NULL;
- GError* _tmp21_ = NULL;
+ GError* _tmp21_;
#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
_error_ = _inner_error_;
#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -760,13 +760,13 @@ gchar* guess_convert (const gchar* text) {
#line 760 "string.c"
{
gchar* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
+ const gchar* _tmp23_;
+ const gchar* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
gsize _tmp27_ = 0UL;
- gchar* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp23_ = text;
#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -858,7 +858,7 @@ gchar* guess_convert (const gchar* text) {
#line 121 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp30_ == ((gsize) _tmp33_)) {
#line 860 "string.c"
- const gchar* _tmp34_ = NULL;
+ const gchar* _tmp34_;
#line 122 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp34_ = charset;
#line 122 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -882,21 +882,21 @@ gchar* guess_convert (const gchar* text) {
static gchar* string_strip (const gchar* self) {
gchar* result = NULL;
gchar* _result_ = NULL;
- gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 901 "string.c"
}
@@ -905,29 +905,29 @@ static gchar* string_strip (const gchar* self) {
static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) {
gchar* result = NULL;
gchar* _result_ = NULL;
- gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar _tmp3_;
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _result_;
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 932 "string.c"
}
@@ -935,17 +935,17 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
gchar* prepped = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- PrepareInputTextOptions _tmp3_ = 0;
- PrepareInputTextOptions _tmp12_ = 0;
- PrepareInputTextOptions _tmp15_ = 0;
- PrepareInputTextOptions _tmp18_ = 0;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ PrepareInputTextOptions _tmp3_;
+ PrepareInputTextOptions _tmp12_;
+ PrepareInputTextOptions _tmp15_;
+ PrepareInputTextOptions _tmp18_;
gboolean _tmp21_ = FALSE;
- PrepareInputTextOptions _tmp22_ = 0;
- gint _tmp25_ = 0;
+ PrepareInputTextOptions _tmp22_;
+ gint _tmp25_;
#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = text;
#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -967,8 +967,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp3_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) == PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) {
#line 969 "string.c"
- const gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ const gchar* _tmp4_;
+ gboolean _tmp5_;
#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = text;
#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -976,9 +976,9 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp5_) {
#line 978 "string.c"
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp6_ = text;
#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -993,8 +993,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
if (_tmp8_ == NULL) {
#line 994 "string.c"
const gchar* _tmp9_ = NULL;
- PrepareInputTextOptions _tmp10_ = 0;
- gchar* _tmp11_ = NULL;
+ PrepareInputTextOptions _tmp10_;
+ gchar* _tmp11_;
#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp10_ = options;
#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1024,8 +1024,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp12_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) {
#line 1026 "string.c"
- const gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp13_ = prepped;
#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1041,8 +1041,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 152 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp15_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) {
#line 1043 "string.c"
- const gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp16_ = prepped;
#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1058,8 +1058,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp18_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) {
#line 1060 "string.c"
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp19_ = prepped;
#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1075,8 +1075,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp22_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) {
#line 1077 "string.c"
- const gchar* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
+ const gchar* _tmp23_;
+ gboolean _tmp24_;
#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp23_ = prepped;
#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1105,13 +1105,13 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
if (_tmp25_ >= 0) {
#line 1106 "string.c"
GString* sb = NULL;
- const gchar* _tmp26_ = NULL;
- GString* _tmp27_ = NULL;
- GString* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- GString* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
+ const gchar* _tmp26_;
+ GString* _tmp27_;
+ GString* _tmp28_;
+ gint _tmp29_;
+ GString* _tmp30_;
+ const gchar* _tmp31_;
+ gchar* _tmp32_;
#line 167 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp26_ = prepped;
#line 167 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1150,9 +1150,9 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
gint64 parse_int64 (const gchar* str, gint num_base) {
gint64 result = 0LL;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint64 _tmp2_ = 0LL;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gint64 _tmp2_;
#line 176 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, 0LL);
#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1172,37 +1172,37 @@ gint64 parse_int64 (const gchar* str, gint num_base) {
static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- gunichar _tmp1_ = 0U;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ gunichar _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1193 "string.c"
- gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1201 "string.c"
} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1207 "string.c"
}
@@ -1211,9 +1211,9 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
inline gboolean string_contains_char (const gchar* haystack, gunichar needle) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- gunichar _tmp1_ = 0U;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ gunichar _tmp1_;
+ gint _tmp2_;
#line 182 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, FALSE);
#line 183 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1233,39 +1233,39 @@ inline gboolean string_contains_char (const gchar* haystack, gunichar needle) {
static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1256 "string.c"
- gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1264 "string.c"
} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1270 "string.c"
}
@@ -1274,9 +1274,9 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
inline gboolean string_contains_str (const gchar* haystack, const gchar* needle) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gint _tmp2_;
#line 186 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, FALSE);
#line 186 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1298,117 +1298,117 @@ inline gboolean string_contains_str (const gchar* haystack, const gchar* needle)
static gchar* string_slice (const gchar* self, glong start, glong end) {
gchar* result = NULL;
glong string_length = 0L;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- glong _tmp2_ = 0L;
- glong _tmp5_ = 0L;
+ gint _tmp0_;
+ gint _tmp1_;
+ glong _tmp2_;
+ glong _tmp5_;
gboolean _tmp8_ = FALSE;
- glong _tmp9_ = 0L;
+ glong _tmp9_;
gboolean _tmp12_ = FALSE;
- glong _tmp13_ = 0L;
- glong _tmp16_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp13_;
+ glong _tmp16_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
#line 1327 "string.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp3_;
+ glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
#line 1336 "string.c"
}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
#line 1342 "string.c"
- glong _tmp6_ = 0L;
- glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
#line 1351 "string.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
#line 1357 "string.c"
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
#line 1366 "string.c"
} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
#line 1370 "string.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
#line 1378 "string.c"
- glong _tmp14_ = 0L;
- glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp14_;
+ glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
#line 1387 "string.c"
} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 1391 "string.c"
}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1413 "string.c"
}
@@ -1417,7 +1417,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
inline gchar* string_sliced_at (const gchar* str, gint index) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ gint _tmp1_;
#line 190 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1425,12 +1425,12 @@ inline gchar* string_sliced_at (const gchar* str, gint index) {
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp1_ >= 0) {
#line 1427 "string.c"
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- const gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gchar* _tmp7_ = NULL;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ gchar* _tmp7_;
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = str;
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1465,12 +1465,12 @@ inline gchar* string_sliced_at (const gchar* str, gint index) {
inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* needle, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 194 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 194 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1498,39 +1498,39 @@ inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* ne
static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1521 "string.c"
- gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1529 "string.c"
} else {
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1535 "string.c"
}
@@ -1539,12 +1539,12 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* needle, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 198 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 198 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1571,12 +1571,12 @@ inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* nee
inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gunichar _tmp2_ = 0U;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gunichar _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 202 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1602,37 +1602,37 @@ inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, g
static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- gunichar _tmp1_ = 0U;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ gunichar _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1623 "string.c"
- gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1631 "string.c"
} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1637 "string.c"
}
@@ -1641,12 +1641,12 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gunichar _tmp2_ = 0U;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gunichar _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 206 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1671,17 +1671,17 @@ inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gi
static gunichar string_get_char (const gchar* self, glong index) {
gunichar result = 0U;
- glong _tmp0_ = 0L;
- gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp0_;
+ gunichar _tmp1_;
+#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1686 "string.c"
}
@@ -1690,11 +1690,11 @@ static gunichar string_get_char (const gchar* self, glong index) {
gchar* string_strip_leading_zeroes (const gchar* str) {
gchar* result = NULL;
GString* stripped = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
gboolean prev_is_space = FALSE;
- GString* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+ GString* _tmp16_;
+ const gchar* _tmp17_;
+ gchar* _tmp18_;
#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 212 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1706,7 +1706,7 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
#line 1706 "string.c"
{
const gchar* iter = NULL;
- const gchar* _tmp1_ = NULL;
+ const gchar* _tmp1_;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = str;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1719,18 +1719,18 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 1721 "string.c"
- const gchar* _tmp5_ = NULL;
- gunichar _tmp6_ = 0U;
+ const gchar* _tmp5_;
+ gunichar _tmp6_;
gunichar ch = 0U;
- const gchar* _tmp7_ = NULL;
- gunichar _tmp8_ = 0U;
+ const gchar* _tmp7_;
+ gunichar _tmp8_;
gboolean _tmp9_ = FALSE;
- gboolean _tmp10_ = FALSE;
+ gboolean _tmp10_;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp2_) {
#line 1731 "string.c"
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp3_ = iter;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1765,7 +1765,7 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
_tmp9_ = TRUE;
#line 1766 "string.c"
} else {
- gunichar _tmp11_ = 0U;
+ gunichar _tmp11_;
#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp11_ = ch;
#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1775,10 +1775,10 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp9_) {
#line 1777 "string.c"
- GString* _tmp12_ = NULL;
- gunichar _tmp13_ = 0U;
- gunichar _tmp14_ = 0U;
- gboolean _tmp15_ = FALSE;
+ GString* _tmp12_;
+ gunichar _tmp13_;
+ gunichar _tmp14_;
+ gboolean _tmp15_;
#line 218 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp12_ = stripped;
#line 218 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1815,57 +1815,57 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
static gboolean string_get_next_char (const gchar* self, gint* index, gunichar* c) {
gunichar _vala_c = 0U;
gboolean result = FALSE;
- gint _tmp0_ = 0;
- gunichar _tmp1_ = 0U;
- gunichar _tmp2_ = 0U;
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ gunichar _tmp1_;
+ gunichar _tmp2_;
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = *index;
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_vala_c = _tmp1_;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = _vala_c;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ != ((gunichar) 0)) {
#line 1833 "string.c"
- gint _tmp3_ = 0;
- gchar* _tmp4_ = NULL;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp3_;
+ gchar* _tmp4_;
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = *index;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_);
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*index = (gint) (_tmp4_ - ((gchar*) self));
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = TRUE;
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (c) {
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1848 "string.c"
}
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1852 "string.c"
} else {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = FALSE;
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (c) {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1860 "string.c"
}
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1864 "string.c"
}
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (c) {
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1870 "string.c"
}
@@ -1875,12 +1875,12 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar*
gchar* string_remove_diacritics (const gchar* istring) {
gchar* result = NULL;
GString* builder = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
gunichar ch = 0U;
gint i = 0;
- GString* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ GString* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
#line 226 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (istring != NULL, NULL);
#line 227 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1892,16 +1892,16 @@ gchar* string_remove_diacritics (const gchar* istring) {
#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 1894 "string.c"
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gunichar _tmp4_ = 0U;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
- gunichar _tmp7_ = 0U;
- GUnicodeType _tmp8_ = 0;
- GString* _tmp9_ = NULL;
- gunichar _tmp10_ = 0U;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
+ gunichar _tmp7_;
+ GUnicodeType _tmp8_;
+ GString* _tmp9_;
+ gunichar _tmp10_;
#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = istring;
#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1978,12 +1978,12 @@ gchar* string_remove_diacritics (const gchar* istring) {
gchar* string_to_hex_string (const gchar* str) {
gchar* result = NULL;
GString* builder = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
guint8* data = NULL;
- const gchar* _tmp1_ = NULL;
- GString* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+ const gchar* _tmp1_;
+ GString* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
#line 246 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 247 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1997,11 +1997,11 @@ gchar* string_to_hex_string (const gchar* str) {
#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 1999 "string.c"
- guint8* _tmp2_ = NULL;
+ guint8* _tmp2_;
const gchar* _tmp3_ = NULL;
- guint8* _tmp4_ = NULL;
- GString* _tmp5_ = NULL;
- guint8* _tmp6_ = NULL;
+ guint8* _tmp4_;
+ GString* _tmp5_;
+ guint8* _tmp6_;
#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = data;
#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2051,13 +2051,13 @@ gchar* string_to_hex_string (const gchar* str) {
guint string_collated_hash (void* ptr) {
guint result = 0U;
gchar* str = NULL;
- void* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- GHashFunc _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- guint _tmp6_ = 0U;
+ void* _tmp0_;
+ gchar* _tmp1_;
+ GHashFunc _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ guint _tmp5_;
+ guint _tmp6_;
#line 273 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = ptr;
#line 273 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2088,9 +2088,9 @@ guint string_collated_hash (void* ptr) {
guint string_precollated_hash (void* ptr) {
guint result = 0U;
- GHashFunc _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
+ GHashFunc _tmp0_;
+ void* _tmp1_;
+ guint _tmp2_;
#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = g_str_hash;
#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2108,17 +2108,17 @@ guint string_precollated_hash (void* ptr) {
gint string_collated_compare (void* a, void* b) {
gint result = 0;
gchar* astr = NULL;
- void* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ void* _tmp0_;
+ gchar* _tmp1_;
gchar* bstr = NULL;
- void* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ void* _tmp2_;
+ gchar* _tmp3_;
gint _result_ = 0;
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ gint _tmp6_;
gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+ gint _tmp8_;
#line 285 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 285 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2144,17 +2144,17 @@ gint string_collated_compare (void* a, void* b) {
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp8_ != 0) {
#line 2146 "string.c"
- gint _tmp9_ = 0;
+ gint _tmp9_;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp9_ = _result_;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp7_ = _tmp9_;
#line 2152 "string.c"
} else {
- GCompareFunc _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gint _tmp13_ = 0;
+ GCompareFunc _tmp10_;
+ const gchar* _tmp11_;
+ const gchar* _tmp12_;
+ gint _tmp13_;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp10_ = g_strcmp0;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2182,12 +2182,12 @@ gint string_collated_compare (void* a, void* b) {
gint string_precollated_compare (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) {
gint result = 0;
gint _result_ = 0;
- GCompareFunc _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
+ GCompareFunc _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ gint _tmp5_;
#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (astr != NULL, 0);
#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2211,17 +2211,17 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp5_ != 0) {
#line 2213 "string.c"
- gint _tmp6_ = 0;
+ gint _tmp6_;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp6_ = _result_;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = _tmp6_;
#line 2219 "string.c"
} else {
- GCompareFunc _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
+ GCompareFunc _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ gint _tmp10_;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp7_ = g_strcmp0;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2244,9 +2244,9 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch
gboolean string_collated_equals (void* a, void* b) {
gboolean result = FALSE;
- void* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ void* _tmp0_;
+ void* _tmp1_;
+ gint _tmp2_;
#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2263,11 +2263,11 @@ gboolean string_collated_equals (void* a, void* b) {
gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gint _tmp4_;
#line 306 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (astr != NULL, FALSE);
#line 306 "/home/jens/Source/shotwell/src/util/string.vala"