From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/NaturalCollate.c | 426 +++++++++++++++++++++++++-------------------------- 1 file changed, 213 insertions(+), 213 deletions(-) (limited to 'src/NaturalCollate.c') diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c index 97255d0..cc78916 100644 --- a/src/NaturalCollate.c +++ b/src/NaturalCollate.c @@ -1,4 +1,4 @@ -/* NaturalCollate.c generated by valac 0.34.7, the Vala compiler +/* NaturalCollate.c generated by valac 0.36.6, the Vala compiler * generated from NaturalCollate.vala, do not modify */ @@ -25,17 +25,17 @@ gchar* natural_collate_collate_key (gchar* str); 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 41 "NaturalCollate.c" } @@ -43,17 +43,17 @@ static gunichar string_get_char (const gchar* self, glong index) { static gint string_index_of_nth_char (const gchar* self, glong c) { gint result = 0; - glong _tmp0_ = 0L; - gchar* _tmp1_ = NULL; -#line 1136 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp0_; + gchar* _tmp1_; +#line 1160 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = c; -#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_utf8_offset_to_pointer (self, _tmp0_); -#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp1_ - ((gchar*) self)); -#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 59 "NaturalCollate.c" } @@ -62,41 +62,41 @@ static gint string_index_of_nth_char (const gchar* self, glong c) { static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 82 "NaturalCollate.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp4_; +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 90 "NaturalCollate.c" } else { - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp5_; + gchar* _tmp6_; +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 102 "NaturalCollate.c" } @@ -107,121 +107,121 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp1_; + glong _tmp8_; + glong _tmp14_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + glong _tmp21_; + gchar* _tmp22_; +#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 126 "NaturalCollate.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp2_; +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 132 "NaturalCollate.c" } else { -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 136 "NaturalCollate.c" } -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 140 "NaturalCollate.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp3_; + glong _tmp4_; + glong _tmp5_; +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 152 "NaturalCollate.c" } else { - gint _tmp6_ = 0; - gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp6_; + gint _tmp7_; +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 162 "NaturalCollate.c" } -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 168 "NaturalCollate.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp9_; + glong _tmp10_; + glong _tmp11_; +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 182 "NaturalCollate.c" } else { - glong _tmp12_ = 0L; - glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp12_; + glong _tmp13_; +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 192 "NaturalCollate.c" } -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 198 "NaturalCollate.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp15_; + glong _tmp16_; +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 207 "NaturalCollate.c" } -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 227 "NaturalCollate.c" } @@ -238,22 +238,22 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) { while (TRUE) { #line 240 "NaturalCollate.c" gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - const gchar* _tmp9_ = NULL; - gunichar _tmp10_ = 0U; - gint _tmp11_ = 0; + const gchar* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp7_; + gint _tmp8_; + const gchar* _tmp9_; + gunichar _tmp10_; + gint _tmp11_; gint second_char = 0; - const gchar* _tmp12_ = NULL; - gint _tmp13_ = 0; - const gchar* _tmp14_ = NULL; - gint _tmp15_ = 0; - gchar* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + const gchar* _tmp12_; + gint _tmp13_; + const gchar* _tmp14_; + gint _tmp15_; + gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp1_ = s; #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -263,9 +263,9 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) { #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" if (_tmp3_ != 0) { #line 266 "NaturalCollate.c" - const gchar* _tmp4_ = NULL; - gunichar _tmp5_ = 0U; - gboolean _tmp6_ = FALSE; + const gchar* _tmp4_; + gunichar _tmp5_; + gboolean _tmp6_; #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp4_ = s; #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -336,17 +336,17 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) { gint natural_collate_compare (const gchar* str1, const gchar* str2) { gint result = 0; - GCompareFunc _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + GCompareFunc _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala" g_return_val_if_fail (str1 != NULL, 0); #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -387,19 +387,19 @@ gint natural_collate_compare (const gchar* str1, const gchar* str2) { static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 405 "NaturalCollate.c" } @@ -408,19 +408,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { static gchar* g_unichar_to_string (gunichar self) { gchar* result = NULL; gchar* str = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 7); -#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str = (gchar*) _tmp0_; -#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = str; -#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_unichar_to_utf8 (self, _tmp1_); -#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = str; -#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 426 "NaturalCollate.c" } @@ -428,18 +428,18 @@ static gchar* g_unichar_to_string (gunichar self) { gchar* natural_collate_collate_key (gchar* str) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; gchar* _result_ = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp2_; gboolean eos = FALSE; - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - const gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; + const gchar* _tmp3_; + gint _tmp4_; + gint _tmp5_; + const gchar* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; #line 47 "/home/jens/Source/shotwell/src/NaturalCollate.vala" g_return_val_if_fail (str != NULL, NULL); #line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -463,28 +463,28 @@ gchar* natural_collate_collate_key (gchar* str) { #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala" while (TRUE) { #line 466 "NaturalCollate.c" - gboolean _tmp6_ = FALSE; - const gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + gboolean _tmp6_; + const gchar* _tmp7_; + gboolean _tmp8_; gint position = 0; - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gint _tmp19_ = 0; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - gint _tmp26_ = 0; - gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - gboolean _tmp31_ = FALSE; - const gchar* _tmp67_ = NULL; - gint _tmp68_ = 0; - gint _tmp69_ = 0; + const gchar* _tmp17_; + const gchar* _tmp18_; + gint _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + const gchar* _tmp25_; + gint _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + gint _tmp29_; + gint _tmp30_; + gboolean _tmp31_; + const gchar* _tmp67_; + gint _tmp68_; + gint _tmp69_; #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp6_ = eos; #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -504,14 +504,14 @@ gchar* natural_collate_collate_key (gchar* str) { #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" while (TRUE) { #line 507 "NaturalCollate.c" - const gchar* _tmp9_ = NULL; - gint _tmp10_ = 0; - gunichar _tmp11_ = 0U; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - gint _tmp16_ = 0; + const gchar* _tmp9_; + gint _tmp10_; + gunichar _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; + gint _tmp16_; #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp9_ = str; #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -590,35 +590,35 @@ gchar* natural_collate_collate_key (gchar* str) { if (!_tmp31_) { #line 592 "NaturalCollate.c" gint number = 0; - const gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gint _tmp34_ = 0; - const gchar* _tmp35_ = NULL; - gint _tmp36_ = 0; - gchar* _tmp37_ = NULL; + const gchar* _tmp32_; + gchar* _tmp33_; + gint _tmp34_; + const gchar* _tmp35_; + gint _tmp36_; + gchar* _tmp37_; gint number_of_superdigits = 0; - gint _tmp38_ = 0; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - gint _tmp43_ = 0; + gint _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gint _tmp41_; + gint _tmp42_; + gint _tmp43_; gchar* to_append = NULL; - gchar* _tmp44_ = NULL; - const gchar* _tmp53_ = NULL; - gint _tmp54_ = 0; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - const gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - const gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; + gchar* _tmp44_; + const gchar* _tmp53_; + gint _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + const gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + const gchar* _tmp65_; + gchar* _tmp66_; #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp32_ = str; #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala" @@ -670,16 +670,16 @@ gchar* natural_collate_collate_key (gchar* str) { #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" while (TRUE) { #line 673 "NaturalCollate.c" - gint _tmp47_ = 0; - gint _tmp48_ = 0; - const gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; + gint _tmp47_; + gint _tmp48_; + const gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" if (!_tmp45_) { #line 682 "NaturalCollate.c" - gint _tmp46_ = 0; + gint _tmp46_; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" _tmp46_ = i; #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala" -- cgit v1.2.3