ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename two variables, to make a little more sense

master
Benno Schulenberg 2017-09-17 16:54:45 +02:00
parent e0a73f58f3
commit 36e88032cb
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/global.c
View File

@ -206,13 +206,13 @@ subnfunc *uncutfunc;
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
filestruct *search_history = NULL; filestruct *search_history = NULL;
/* The search string history list. */ /* The search string history list. */
filestruct *searchage = NULL; filestruct *searchtop = NULL;
/* The top of the search string history list. */ /* The top of the search string history list. */
filestruct *searchbot = NULL; filestruct *searchbot = NULL;
/* The bottom of the search string history list. */ /* The bottom of the search string history list. */
filestruct *replace_history = NULL; filestruct *replace_history = NULL;
/* The replace string history list. */ /* The replace string history list. */
filestruct *replaceage = NULL; filestruct *replacetop = NULL;
/* The top of the replace string history list. */ /* The top of the replace string history list. */
filestruct *replacebot = NULL; filestruct *replacebot = NULL;
/* The bottom of the replace string history list. */ /* The bottom of the replace string history list. */
@ -1832,8 +1832,8 @@ void thanks_for_all_the_fish(void)
#endif /* !DISABLE_COLOR */ #endif /* !DISABLE_COLOR */
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
/* Free the search and replace history lists. */ /* Free the search and replace history lists. */
free_filestruct(searchage); free_filestruct(searchtop);
free_filestruct(replaceage); free_filestruct(replacetop);
#endif #endif
/* Free the list of functions. */ /* Free the list of functions. */
while (allfuncs != NULL) { while (allfuncs != NULL) {

14
src/history.c
View File

@ -33,12 +33,12 @@ void history_init(void)
{ {
search_history = make_new_node(NULL); search_history = make_new_node(NULL);
search_history->data = mallocstrcpy(NULL, ""); search_history->data = mallocstrcpy(NULL, "");
searchage = search_history; searchtop = search_history;
searchbot = search_history; searchbot = search_history;
replace_history = make_new_node(NULL); replace_history = make_new_node(NULL);
replace_history->data = mallocstrcpy(NULL, ""); replace_history->data = mallocstrcpy(NULL, "");
replaceage = replace_history; replacetop = replace_history;
replacebot = replace_history; replacebot = replace_history;
execute_history = make_new_node(NULL); execute_history = make_new_node(NULL);
@ -81,10 +81,10 @@ void update_history(filestruct **h, const char *s)
filestruct **hage = NULL, **hbot = NULL, *thesame; filestruct **hage = NULL, **hbot = NULL, *thesame;
if (*h == search_history) { if (*h == search_history) {
hage = &searchage; hage = &searchtop;
hbot = &searchbot; hbot = &searchbot;
} else if (*h == replace_history) { } else if (*h == replace_history) {
hage = &replaceage; hage = &replacetop;
hbot = &replacebot; hbot = &replacebot;
} else if (*h == execute_history) { } else if (*h == execute_history) {
hage = &executetop; hage = &executetop;
@ -174,10 +174,10 @@ char *get_history_completion(filestruct **h, char *s, size_t len)
filestruct *hage = NULL, *hbot = NULL, *p; filestruct *hage = NULL, *hbot = NULL, *p;
if (*h == search_history) { if (*h == search_history) {
hage = searchage; hage = searchtop;
hbot = searchbot; hbot = searchbot;
} else if (*h == replace_history) { } else if (*h == replace_history) {
hage = replaceage; hage = replacetop;
hbot = replacebot; hbot = replacebot;
} else if (*h == execute_history) { } else if (*h == execute_history) {
hage = executetop; hage = executetop;
@ -405,7 +405,7 @@ void save_history(void)
/* Don't allow others to read or write the history file. */ /* Don't allow others to read or write the history file. */
chmod(searchhist, S_IRUSR | S_IWUSR); chmod(searchhist, S_IRUSR | S_IWUSR);
if (!writehist(hist, searchage) || !writehist(hist, replaceage) || if (!writehist(hist, searchtop) || !writehist(hist, replacetop) ||
!writehist(hist, executetop)) !writehist(hist, executetop))
fprintf(stderr, _("Error writing %s: %s\n"), searchhist, fprintf(stderr, _("Error writing %s: %s\n"), searchhist,
strerror(errno)); strerror(errno));

4
src/proto.h
View File

@ -160,10 +160,10 @@ extern subnfunc *uncutfunc;
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
extern filestruct *search_history; extern filestruct *search_history;
extern filestruct *searchage; extern filestruct *searchtop;
extern filestruct *searchbot; extern filestruct *searchbot;
extern filestruct *replace_history; extern filestruct *replace_history;
extern filestruct *replaceage; extern filestruct *replacetop;
extern filestruct *replacebot; extern filestruct *replacebot;
extern filestruct *execute_history; extern filestruct *execute_history;
extern filestruct *executetop; extern filestruct *executetop;