aboutsummaryrefslogtreecommitdiff
path: root/text.c
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2015-07-06 15:18:23 +0200
committerMarc André Tanner <mat@brain-dump.org>2015-07-06 15:18:23 +0200
commit913d767475110bd73ce4fe772ff2444004b8f359 (patch)
treee65f099568444167ca6ebac2c2368e653b7e1ef3 /text.c
parente7dabd3d87d89efe2fadbe1e21d03fbeb3cc68a6 (diff)
downloadvis-913d767475110bd73ce4fe772ff2444004b8f359.tar.gz
vis-913d767475110bd73ce4fe772ff2444004b8f359.tar.xz
Move filename from Text to File
Also apply syntax rules every time the file name changes.
Diffstat (limited to 'text.c')
-rw-r--r--text.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/text.c b/text.c
index e013979..d131adc 100644
--- a/text.c
+++ b/text.c
@@ -131,7 +131,6 @@ struct Text {
Action *last_action; /* the last action added to the tree, chronologically */
Action *saved_action; /* the last action at the time of the save operation */
size_t size; /* current file content size in bytes */
- char *filename; /* filename of which data was loaded */
struct stat info; /* stat as proped on load time */
int fd; /* the file descriptor of the original mmap-ed data */
LineCache lines; /* mapping between absolute pos in bytes and logical line breaks */
@@ -960,8 +959,6 @@ bool text_range_save(Text *txt, Filerange *range, const char *filename) {
ok:
txt->saved_action = txt->history;
text_snapshot(txt);
- if (!txt->filename)
- text_filename_set(txt, filename);
return true;
err:
if (fd != -1)
@@ -1008,7 +1005,6 @@ Text *text_load(const char *filename) {
piece_init(&txt->end, &txt->begin, NULL, NULL, 0);
lineno_cache_invalidate(&txt->lines);
if (filename) {
- text_filename_set(txt, filename);
txt->fd = open(filename, O_RDONLY);
if (txt->fd == -1)
goto out;
@@ -1189,7 +1185,6 @@ void text_free(Text *txt) {
buffer_free(buf);
}
- free(txt->filename);
free(txt);
}
@@ -1475,15 +1470,6 @@ int text_fd_get(Text *txt) {
return txt->fd;
}
-const char *text_filename_get(Text *txt) {
- return txt->filename;
-}
-
-void text_filename_set(Text *txt, const char *filename) {
- free(txt->filename);
- txt->filename = filename ? strdup(filename) : NULL;
-}
-
Regex *text_regex_new(void) {
Regex *r = calloc(1, sizeof(Regex));
if (!r)