mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-01-01 07:04:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: rename two parameters and one variable, away from single letters

Browse Source
This commit is contained in:
Benno Schulenberg 2021-10-13 17:04:21 +02:00
parent 74fd78adb1
commit 9341c96def
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/history.c
View File

@ -147,50 +147,51 @@ void update_history(linestruct **item, const char *text)
} }
#ifdef ENABLE_TABCOMP #ifdef ENABLE_TABCOMP
/* Go backward through one of three history lists, starting at its item h, /* Go backward through one of three history lists, starting at item *here,
* searching for a string that is a tab completion of the given string s, * searching for a string that is a tab completion of the given string,
* looking at only the first len characters of s. When found, make h point * looking at only its first len characters. When found, make *here point
* at it and return that string; otherwise, don't move h and return s. */ * at the item and return its string; otherwise, just return the string. */
char *get_history_completion(linestruct **h, char *s, size_t len) char *get_history_completion(linestruct **here, char *string, size_t len)
{ {
linestruct *htop = NULL, *hbot = NULL, *p; linestruct *htop = NULL, *hbot = NULL;
linestruct *item;
if (*h == search_history) { if (*here == search_history) {
htop = searchtop; htop = searchtop;
hbot = searchbot; hbot = searchbot;
} else if (*h == replace_history) { } else if (*here == replace_history) {
htop = replacetop; htop = replacetop;
hbot = replacebot; hbot = replacebot;
} else if (*h == execute_history) { } else if (*here == execute_history) {
htop = executetop; htop = executetop;
hbot = executebot; hbot = executebot;
} }
/* First search from the current position to the top of the list /* First search from the current position to the top of the list
* for a match of len characters. Skip over an exact match. */ * for a match of len characters. Skip over an exact match. */
p = find_history((*h)->prev, htop, s, len); item = find_history((*here)->prev, htop, string, len);
while (p != NULL && strcmp(p->data, s) == 0) while (item != NULL && strcmp(item->data, string) == 0)
p = find_history(p->prev, htop, s, len); item = find_history(item->prev, htop, string, len);
if (p != NULL) { if (item) {
*h = p; *here = item;
return mallocstrcpy(s, (*h)->data); return mallocstrcpy(string, item->data);
} }
/* Now search from the bottom of the list to the original position. */ /* Now search from the bottom of the list to the original position. */
p = find_history(hbot, *h, s, len); item = find_history(hbot, *here, string, len);
while (p != NULL && strcmp(p->data, s) == 0) while (item != NULL && strcmp(item->data, string) == 0)
p = find_history(p->prev, *h, s, len); item = find_history(item->prev, *here, string, len);
if (p != NULL) { if (item) {
*h = p; *here = item;
return mallocstrcpy(s, (*h)->data); return mallocstrcpy(string, item->data);
} }
/* When no useful match was found, simply return the given string. */ /* When no useful match was found, simply return the given string. */
return (char *)s; return (char *)string;
} }
#endif /* ENABLE_TABCOMP */ #endif /* ENABLE_TABCOMP */