← Back to branch summary

~apachelogger/ubuntuone-client/kwallet-support

« back to all changes in this revision

Viewing changes to nautilus/highlight.c

  • Committer: Tarmac
  • Author(s): Alejandro J. Cura
  • Date: 2010-07-23 09:03:23 UTC
  • mfrom: (589.1.2 please-strict-compilation)
  • Revision ID: rodney.dawes@canonical.com-20100723090323-xwfiwkng4cx7wbho
Better compliance with C89 standard and the -pedantic gcc flag

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus/highlight.c
99
99
        GTree *result_parts;
100
100
        gchar *folded_needles;
101
101
        gchar *folded_haystack;
 
102
        gchar **needle;
 
103
        gchar *escaped_str;
102
104
        BuildResultsData results_data;
103
105
 
104
106
        folded_needles = g_utf8_casefold (needles, -1);
114
116
                                        destroy_tree_array);
115
117
        
116
118
        split_needles = g_strsplit (folded_needles, " ", 0);
117
 
        gchar **needle = split_needles;
 
119
        needle = split_needles;
118
120
        while (*needle != NULL) {
 
121
                gchar *search_start;
 
122
                gchar *start_ptr;
119
123
                glong needle_len = g_utf8_strlen (*needle, -1);
120
124
                if (needle_len < 1) {
121
125
                        needle++;
122
126
                        continue;
123
127
                }
124
 
                gchar *search_start = folded_haystack;
125
 
                gchar *start_ptr = g_strstr_len (search_start,
126
 
                                                 -1,
127
 
                                                 *needle);
 
128
                search_start = folded_haystack;
 
129
                start_ptr = g_strstr_len (search_start, -1, *needle);
128
130
                while (start_ptr != NULL) {
129
131
                        glong start = g_utf8_pointer_to_offset (folded_haystack,
130
132
                                                                start_ptr);
148
150
 
149
151
        g_tree_foreach (result_parts, build_results, &results_data);
150
152
 
151
 
        gchar *escaped_str = g_markup_escape_text (results_data.source_cursor,
152
 
                                                   -1);
 
153
        escaped_str = g_markup_escape_text (results_data.source_cursor, -1);
153
154
        g_string_append (results_data.built_string,
154
155
                         escaped_str);
155
156
        g_free (escaped_str);