diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2019-07-12 16:16:34 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2019-07-12 16:16:34 +0200 |
| commit | e905afb102569e93e2f6ece9a9ab515ac1fd4f04 (patch) | |
| tree | 56c764f3a3fe3848ef2aa161d143f33cb2eaeb8e /src/NaturalCollate.vala | |
| parent | 71137cc5832110d91599d68790402cf196762ed3 (diff) | |
| parent | cb774d1baf242adcc03a1df5eed6d100f7e3bd55 (diff) | |
Merge branch 'release/debian/0.30.4-1'debian/0.30.4-1
Diffstat (limited to 'src/NaturalCollate.vala')
| -rw-r--r-- | src/NaturalCollate.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/NaturalCollate.vala b/src/NaturalCollate.vala index 4adb027..6d38a08 100644 --- a/src/NaturalCollate.vala +++ b/src/NaturalCollate.vala @@ -20,7 +20,7 @@ private const unichar SUPERDIGIT = ':'; private const unichar NUM_SENTINEL = 0x2; // glib uses these, so do we private const string COLLATION_SENTINEL = "\x01\x01\x01"; -private static int read_number(owned string s, ref int byte_index) { +private static int read_number(owned string s, ref long byte_index) { /* * Given a string in the form [numerals]*[everythingelse]* * returns the int value of the first block and increments index @@ -33,7 +33,7 @@ private static int read_number(owned string s, ref int byte_index) { while (s.length != 0 && s.get_char(0).isdigit()) { number = number*10; number += s.get_char(0).digit_value(); - int second_char = s.index_of_nth_char(1); + var second_char = s.index_of_nth_char(1); s = s.substring(second_char); byte_index += second_char; } @@ -56,7 +56,7 @@ public static string collate_key(owned string str) { while (!eos) { assert(str.validate()); - int position = 0; + long position = 0L; while (!(str.get_char(position).to_string() in "0123456789")) { // We only care about plain old 0123456789, aping what g_utf8_collate_key_for_filename does position++; @@ -69,7 +69,7 @@ public static string collate_key(owned string str) { str = str.substring(position); eos = (str.length == 0); - position = 0; + position = 0L; if (!eos) { // We have some numbers to handle in front of us |