takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup strtok_r loops

This commit is contained in:
Daniel Micay 2012-09-18 20:06:34 -04:00
parent 1273e58d59
commit 3d8f18cebd
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
termite.cc
View File

@ -95,11 +95,8 @@ static void find_urls(VteTerminal *vte, search_panel_info *panel_info) {
GArray *attributes = g_array_new(FALSE, FALSE, sizeof (vte_char_attributes)); GArray *attributes = g_array_new(FALSE, FALSE, sizeof (vte_char_attributes));
char *content = vte_terminal_get_text(vte, NULL, NULL, attributes); char *content = vte_terminal_get_text(vte, NULL, NULL, attributes);
char *s_ptr = content, *saveptr; for (char *s_ptr = content, *saveptr; ; s_ptr = nullptr) {
for (; ; s_ptr = NULL) {
char *token = strtok_r(s_ptr, "\n", &saveptr); char *token = strtok_r(s_ptr, "\n", &saveptr);
if (!token) { if (!token) {
break; break;
} }
@ -668,12 +665,10 @@ GtkTreeModel *create_completion_model(VteTerminal *vte) {
return GTK_TREE_MODEL(store); return GTK_TREE_MODEL(store);
} }
char *s_ptr = content, *saveptr;
auto less = [](const char *a, const char *b) { return strcmp(a, b) < 0; }; auto less = [](const char *a, const char *b) { return strcmp(a, b) < 0; };
std::set<const char *, decltype(less)> tokens(less); std::set<const char *, decltype(less)> tokens(less);
for (; ; s_ptr = NULL) { for (char *s_ptr = content, *saveptr; ; s_ptr = nullptr) {
char *token = strtok_r(s_ptr, " \n\t", &saveptr); char *token = strtok_r(s_ptr, " \n\t", &saveptr);
if (!token) { if (!token) {
break; break;