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

tweaks: rename two variables, away from abbreviations 

Also reshuffle a few declarations, for Christmas.
master
Benno Schulenberg 2021-10-12 18:02:24 +02:00
parent 99607a5bbe
commit 185e4d6b12
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/history.c
View File

@ -424,9 +424,9 @@ void load_poshistory(void)
/* Save the recorded cursor positions for files that were edited. */ /* Save the recorded cursor positions for files that were edited. */
void save_poshistory(void) void save_poshistory(void)
{ {
poshiststruct *posptr;
struct stat fileinfo;
FILE *histfile = fopen(poshistname, "wb"); FILE *histfile = fopen(poshistname, "wb");
struct stat fileinfo;
poshiststruct *item;
if (histfile == NULL) { if (histfile == NULL) {
jot_error(N_("Error writing %s: %s"), poshistname, strerror(errno)); jot_error(N_("Error writing %s: %s"), poshistname, strerror(errno));
@ -437,15 +437,15 @@ void save_poshistory(void)
if (chmod(poshistname, S_IRUSR | S_IWUSR) < 0) if (chmod(poshistname, S_IRUSR | S_IWUSR) < 0)
jot_error(N_("Cannot limit permissions on %s: %s"), poshistname, strerror(errno)); jot_error(N_("Cannot limit permissions on %s: %s"), poshistname, strerror(errno));
for (posptr = position_history; posptr != NULL; posptr = posptr->next) { for (item = position_history; item != NULL; item = item->next) {
char *path_and_place; char *path_and_place;
size_t length; size_t length;
/* Assume 20 decimal positions each for line and column number, /* Assume 20 decimal positions each for line and column number,
* plus two spaces, plus the line feed, plus the null byte. */ * plus two spaces, plus the line feed, plus the null byte. */
path_and_place = nmalloc(strlen(posptr->filename) + 44); path_and_place = nmalloc(strlen(item->filename) + 44);
sprintf(path_and_place, "%s %zd %zd\n", sprintf(path_and_place, "%s %zd %zd\n",
posptr->filename, posptr->linenumber, posptr->columnnumber); item->filename, item->linenumber, item->columnnumber);
length = strlen(path_and_place); length = strlen(path_and_place);
/* Encode newlines in filenames as NULs. */ /* Encode newlines in filenames as NULs. */
@ -490,8 +490,9 @@ void reload_positions_if_needed(void)
* current buffer. If no existing entry is found, add a new one at the end. */ * current buffer. If no existing entry is found, add a new one at the end. */
void update_poshistory(void) void update_poshistory(void)
{ {
poshiststruct *posptr, *theone, *posprev = NULL;
char *fullpath = get_full_path(openfile->filename); char *fullpath = get_full_path(openfile->filename);
poshiststruct *previous = NULL;
poshiststruct *item, *theone;
if (fullpath == NULL || openfile->filename[0] == '\0') { if (fullpath == NULL || openfile->filename[0] == '\0') {
free(fullpath); free(fullpath);
@ -501,28 +502,28 @@ void update_poshistory(void)
reload_positions_if_needed(); reload_positions_if_needed();
/* Look for a matching filename in the list. */ /* Look for a matching filename in the list. */
for (posptr = position_history; posptr != NULL; posptr = posptr->next) { for (item = position_history; item != NULL; item = item->next) {
if (!strcmp(posptr->filename, fullpath)) if (!strcmp(item->filename, fullpath))
break; break;
posprev = posptr; previous = item;
} }
/* Don't record files that have the default cursor position. */ /* Don't record files that have the default cursor position. */
if (openfile->current->lineno == 1 && openfile->current_x == 0) { if (openfile->current->lineno == 1 && openfile->current_x == 0) {
if (posptr != NULL) { if (item != NULL) {
if (posprev == NULL) if (previous == NULL)
position_history = posptr->next; position_history = item->next;
else else
posprev->next = posptr->next; previous->next = item->next;
free(posptr->filename); free(item->filename);
free(posptr); free(item);
save_poshistory(); save_poshistory();
} }
free(fullpath); free(fullpath);
return; return;
} }
theone = posptr; theone = item;
/* If we didn't find it, make a new node; otherwise, if we're /* If we didn't find it, make a new node; otherwise, if we're
* not at the end, move the matching one to the end. */ * not at the end, move the matching one to the end. */
@ -532,15 +533,15 @@ void update_poshistory(void)
if (position_history == NULL) if (position_history == NULL)
position_history = theone; position_history = theone;
else else
posprev->next = theone; previous->next = theone;
} else if (posptr->next != NULL) { } else if (item->next != NULL) {
if (posprev == NULL) if (previous == NULL)
position_history = posptr->next; position_history = item->next;
else else
posprev->next = posptr->next; previous->next = item->next;
while (posptr->next != NULL) while (item->next != NULL)
posptr = posptr->next; item = item->next;
posptr->next = theone; item->next = theone;
} }
/* Store the last cursor position. */ /* Store the last cursor position. */
@ -558,25 +559,25 @@ void update_poshistory(void)
* set line and column to the retrieved values. */ * set line and column to the retrieved values. */
bool has_old_position(const char *file, ssize_t *line, ssize_t *column) bool has_old_position(const char *file, ssize_t *line, ssize_t *column)
{ {
poshiststruct *posptr;
char *fullpath = get_full_path(file); char *fullpath = get_full_path(file);
poshiststruct *item;
if (fullpath == NULL) if (fullpath == NULL)
return FALSE; return FALSE;
reload_positions_if_needed(); reload_positions_if_needed();
posptr = position_history; item = position_history;
while (posptr != NULL && strcmp(posptr->filename, fullpath) != 0) while (item != NULL && strcmp(item->filename, fullpath) != 0)
posptr = posptr->next; item = item->next;
free(fullpath); free(fullpath);
if (posptr == NULL) if (item == NULL)
return FALSE; return FALSE;
*line = posptr->linenumber; *line = item->linenumber;
*column = posptr->columnnumber; *column = item->columnnumber;
return TRUE; return TRUE;
} }
#endif /* ENABLE_HISTORIES */ #endif /* ENABLE_HISTORIES */