1774

Committed 06 Apr 2026 08:55AM UTC coverage: 83.228% (+0.1%) from 83.117%

Build # 1774

Build Type

push

travis-ci

Committed by

thoni56

Commit Message

[tidy][unused] Remove more unused stuff after move to memory-is-truth

Coverage Stats

15676 of 18835 relevant lines covered (83.23%)

15599379.55 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.97

src/editorbuffer.c

#include "editorbuffer.h"

#include <string.h>
#include <stdlib.h>

#include "commons.h"
#include "editor.h"
#include "editorbuffertable.h"
#include "fileio.h"
#include "filetable.h"
#include "globals.h"
#include "log.h"
#include "memory.h"
#include "undo.h"


static void fillEmptyEditorBuffer(EditorBuffer *buffer, char *realFileName, int fileNumber, char *preLoadedFromFile) {
    buffer->allocation = (EditorBufferAllocationData){
        .bufferSize = 0, .text = NULL, .allocatedFreePrefixSize = 0,
        .allocatedBlock = NULL, .allocatedIndex = 0,
        .allocatedSize = 0};
    *buffer = (EditorBuffer){
        .fileName = realFileName, .fileNumber = fileNumber, .preLoadedFromFile = preLoadedFromFile,
        .markers = NULL, .allocation = buffer->allocation};
    buffer->modificationTime = 0;
    buffer->size = 0;
    buffer->textLoaded = false;
    assert(buffer->preLoadedFromFile == NULL || buffer->preLoadedFromFile != buffer->fileName);
}

EditorBuffer *newEditorBuffer(char *realFileName, int fileNumber, char *preLoadedFromFile, time_t modificationTime,
                              size_t size) {
    EditorBuffer *editorBuffer = malloc(sizeof(EditorBuffer));
    fillEmptyEditorBuffer(editorBuffer, realFileName, fileNumber, preLoadedFromFile);
    editorBuffer->modificationTime = modificationTime;
    editorBuffer->size = size;
    return editorBuffer;
}

EditorBuffer *createNewEditorBuffer(char *realFileName, char *preLoadedFromFile, time_t modificationTime,
                                    size_t size) {
    char *normalizedRealFileName = strdup(normalizeFileName_static(realFileName, cwd));

    assert(preLoadedFromFile == NULL || strcmp(realFileName, preLoadedFromFile) != 0);
    char *normalizedLoadedFromFile = NULL;
    if (preLoadedFromFile != NULL) {
        normalizedLoadedFromFile = normalizeFileName_static(preLoadedFromFile, cwd);
        normalizedLoadedFromFile = strdup(normalizedLoadedFromFile);
    }

    EditorBuffer *buffer = newEditorBuffer(normalizedRealFileName, 0, normalizedLoadedFromFile, modificationTime, size);
    log_trace("created buffer '%s'('%s')", buffer->fileName, buffer->preLoadedFromFile?buffer->preLoadedFromFile:"(null)");

    registerEditorBuffer(buffer);

    // set fileNumber last, because, addfiletabitem calls back the statb
    // from editor, so be tip-top at this moment!
    buffer->fileNumber = addFileNameToFileTable(normalizedRealFileName);

    return buffer;
}

static void checkForMagicMarker(EditorBufferAllocationData *allocation) {
    assert(allocation->allocatedBlock[allocation->allocatedSize] == 0x3b);
}

static void freeMarkersInEditorBuffer(EditorBuffer *buffer) {
    for (EditorMarker *marker = buffer->markers; marker != NULL;) {
        EditorMarker *next = marker->next;
        free(marker);
        marker = next;
    }
}

bool isPreloaded(EditorBuffer *buffer) {
    return buffer != NULL && buffer->preLoadedFromFile != NULL;
}

void freeEditorBuffer(EditorBuffer *buffer) {
    if (buffer == NULL)
        return;
    log_trace("freeing buffer %s==%s", buffer->fileName, buffer->preLoadedFromFile?buffer->preLoadedFromFile:"(null)");
    if (isPreloaded(buffer)) {
        free(buffer->preLoadedFromFile);
    }
    free(buffer->fileName);

    freeMarkersInEditorBuffer(buffer);

    if (buffer->textLoaded) {
        log_trace("freeing allocated block 0x%x of size %d", buffer->allocation.allocatedBlock,
                  buffer->allocation.allocatedSize);
        checkForMagicMarker(&buffer->allocation);
        freeTextSpace(buffer->allocation.allocatedBlock,
                      buffer->allocation.allocatedIndex);
    }
    free(buffer);
}

EditorBuffer *getOpenedAndLoadedEditorBuffer(char *fileName) {
    EditorBuffer *buffer = getEditorBufferForFile(fileName);
    if (buffer!=NULL && buffer->textLoaded)
        return buffer;
    return NULL;
}

EditorBuffer *findOrCreateAndLoadEditorBufferForFile(char *fileName) {
    EditorBuffer *editorBuffer = getEditorBufferForFile(fileName);

    if (editorBuffer != NULL && editorBuffer->textLoaded)
        /* Found one with text loaded, return it */
        return editorBuffer;

    if (editorBuffer == NULL) {
        /* No buffer found, create one unless it is a directory */
        if (fileExists(fileName) && !isDirectory(fileName)) {
            editorBuffer = createNewEditorBuffer(fileName, NULL, fileModificationTime(fileName),
                                                 fileSize(fileName));
            loadFileIntoEditorBuffer(editorBuffer, fileModificationTime(fileName), fileSize(fileName));
        } else
            return NULL;
    }

    return editorBuffer;
}

// Only used from Options for preload
EditorBuffer *openEditorBufferFromPreload(char *fileName, char *preLoadedFromFile) {
    EditorBuffer *buffer = getEditorBufferForFile(fileName);
    if (buffer != NULL) {
        time_t incomingMtime = fileModificationTime(preLoadedFromFile);
        if (incomingMtime == buffer->modificationTime) {
            log_debug("Preload '%s': unchanged (mtime %ld), keeping existing buffer", fileName, (long)incomingMtime);
            buffer->preloadedThisRequest = true;
            return buffer;
        }
        log_debug("Preload '%s': content changed (mtime %ld -> %ld), reloading", fileName,
                  (long)buffer->modificationTime, (long)incomingMtime);
        free(buffer->preLoadedFromFile);
        buffer->preLoadedFromFile = strdup(normalizeFileName_static(preLoadedFromFile, cwd));
        loadFileIntoEditorBuffer(buffer, incomingMtime, fileSize(preLoadedFromFile));
        buffer->preloadedThisRequest = true;
        return buffer;
    }
    buffer = createNewEditorBuffer(fileName, preLoadedFromFile, fileModificationTime(preLoadedFromFile),
                                   fileSize(preLoadedFromFile));
    buffer->preloadedThisRequest = true;
    return buffer;
}

char *getTextInEditorBuffer(EditorBuffer *buffer) {
    return buffer->allocation.text;
}

size_t getSizeOfEditorBuffer(EditorBuffer *buffer) {
    return buffer->allocation.bufferSize;
}

void setSizeOfEditorBuffer(EditorBuffer *buffer, size_t size) {
    buffer->allocation.bufferSize = size;
}

void setEditorBufferModified(EditorBuffer *buffer) {
    buffer->modified = true;
    buffer->modifiedSinceLastQuasiSave = true;
}

void renameEditorBuffer(EditorBuffer *buffer, char *newName, EditorUndo **undo) {
    char newFileName[MAX_FILE_NAME_SIZE];

    strcpy(newFileName, normalizeFileName_static(newName, cwd));

    EditorBuffer *existing_buffer = getEditorBufferForFile(buffer->fileName);
    if (existing_buffer == NULL) {
        char tmpBuffer[TMP_BUFF_SIZE];
        sprintf(tmpBuffer, "Trying to rename non existing buffer %s", buffer->fileName);
        errorMessage(ERR_INTERNAL, tmpBuffer);
        return;
    }
    assert(existing_buffer == buffer);

    EditorBuffer *deregistered_original = deregisterEditorBuffer(buffer->fileName);
    assert(deregistered_original == buffer);

    char *oldName = buffer->fileName;
    buffer->fileName = strdup(newFileName);

    // Update fileNumber
    int newFileNumber = addFileNameToFileTable(newFileName);
    getFileItemWithFileNumber(newFileNumber)->isArgument = getFileItemWithFileNumber(buffer->fileNumber)->isArgument;
    buffer->fileNumber = newFileNumber;

    EditorBuffer *existing_buffer_with_the_new_name = getEditorBufferForFile(newFileName);
    if (existing_buffer_with_the_new_name != NULL) {
        EditorBuffer *deleted = deregisterEditorBuffer(newFileName);
        freeEditorBuffer(deleted);
    }
    registerEditorBuffer(buffer);

    // note undo operation
    if (undo!=NULL) {
        *undo = newUndoRename(buffer, oldName, *undo);
    }
    setEditorBufferModified(buffer);

    // finally create a buffer with old name and empty text in order
    // to keep information that the file is no longer existing
    // so old references will be removed on update (fixing problem of
    // of moving a package into an existing package).
    EditorBuffer *removed = createNewEditorBuffer(oldName, NULL, buffer->modificationTime, buffer->size);
    allocateNewEditorBufferTextSpace(removed, 0);
    removed->textLoaded = true;
    setEditorBufferModified(removed);
}

1	#include "editorbuffer.h"
2
3	#include <string.h>
4	#include <stdlib.h>
5
6	#include "commons.h"
7	#include "editor.h"
8	#include "editorbuffertable.h"
9	#include "fileio.h"
10	#include "filetable.h"
11	#include "globals.h"
12	#include "log.h"
13	#include "memory.h"
14	#include "undo.h"
15
16
17	static void fillEmptyEditorBuffer(EditorBuffer buffer, char realFileName, int fileNumber, char *preLoadedFromFile) {	461,882✔
18	buffer->allocation = (EditorBufferAllocationData){	461,882✔
19	.bufferSize = 0, .text = NULL, .allocatedFreePrefixSize = 0,
20	.allocatedBlock = NULL, .allocatedIndex = 0,
21	.allocatedSize = 0};
22	*buffer = (EditorBuffer){	461,882✔
23	.fileName = realFileName, .fileNumber = fileNumber, .preLoadedFromFile = preLoadedFromFile,
24	.markers = NULL, .allocation = buffer->allocation};	461,882✔
25	buffer->modificationTime = 0;	461,882✔
26	buffer->size = 0;	461,882✔
27	buffer->textLoaded = false;	461,882✔
28	assert(buffer->preLoadedFromFile == NULL \|\| buffer->preLoadedFromFile != buffer->fileName);	461,882✔
29	}
30		461,882✔
31	EditorBuffer newEditorBuffer(char realFileName, int fileNumber, char *preLoadedFromFile, time_t modificationTime,
32	size_t size) {	461,882✔
33	EditorBuffer *editorBuffer = malloc(sizeof(EditorBuffer));	461,882✔
34	fillEmptyEditorBuffer(editorBuffer, realFileName, fileNumber, preLoadedFromFile);	461,882✔
35	editorBuffer->modificationTime = modificationTime;	461,882✔
36	editorBuffer->size = size;	461,882✔
37	return editorBuffer;
38	}
39		461,882✔
40	EditorBuffer createNewEditorBuffer(char realFileName, char *preLoadedFromFile, time_t modificationTime,
41	size_t size) {	461,882✔
42	char *normalizedRealFileName = strdup(normalizeFileName_static(realFileName, cwd));
43		461,882✔
44	assert(preLoadedFromFile == NULL \|\| strcmp(realFileName, preLoadedFromFile) != 0);	461,882✔
45	char *normalizedLoadedFromFile = NULL;	47✔
46	if (preLoadedFromFile != NULL) {	47✔
47	normalizedLoadedFromFile = normalizeFileName_static(preLoadedFromFile, cwd);
48	normalizedLoadedFromFile = strdup(normalizedLoadedFromFile);
49	}	461,882✔
50		461,882✔
51	EditorBuffer *buffer = newEditorBuffer(normalizedRealFileName, 0, normalizedLoadedFromFile, modificationTime, size);
52	log_trace("created buffer '%s'('%s')", buffer->fileName, buffer->preLoadedFromFile?buffer->preLoadedFromFile:"(null)");	461,882✔
53
54	registerEditorBuffer(buffer);
55
56	// set fileNumber last, because, addfiletabitem calls back the statb	461,882✔
57	// from editor, so be tip-top at this moment!
58	buffer->fileNumber = addFileNameToFileTable(normalizedRealFileName);	461,882✔
59
60	return buffer;
61	}	461,744✔
62		461,744✔
63	static void checkForMagicMarker(EditorBufferAllocationData *allocation) {
64	assert(allocation->allocatedBlock[allocation->allocatedSize] == 0x3b);	461,744✔
65	}	461,744✔
66		×
67	static void freeMarkersInEditorBuffer(EditorBuffer *buffer) {	×
68	for (EditorMarker *marker = buffer->markers; marker != NULL;) {	×
69	EditorMarker *next = marker->next;
70	free(marker);	461,744✔
71	marker = next;
72	}	463,210✔
73	}	463,210✔
74
75	bool isPreloaded(EditorBuffer *buffer) {
76	return buffer != NULL && buffer->preLoadedFromFile != NULL;	461,745✔
77	}	461,745✔
78		1✔
79	void freeEditorBuffer(EditorBuffer *buffer) {	461,744✔
80	if (buffer == NULL)	461,744✔
81	return;	20✔
82	log_trace("freeing buffer %s==%s", buffer->fileName, buffer->preLoadedFromFile?buffer->preLoadedFromFile:"(null)");
83	if (isPreloaded(buffer)) {	461,744✔
84	free(buffer->preLoadedFromFile);
85	}	461,744✔
86	free(buffer->fileName);
87		461,744✔
88	freeMarkersInEditorBuffer(buffer);	461,744✔
89
90	if (buffer->textLoaded) {	461,744✔
91	log_trace("freeing allocated block 0x%x of size %d", buffer->allocation.allocatedBlock,	461,744✔
92	buffer->allocation.allocatedSize);
93	checkForMagicMarker(&buffer->allocation);
94	freeTextSpace(buffer->allocation.allocatedBlock,	461,744✔
95	buffer->allocation.allocatedIndex);
96	}
97	free(buffer);	7,394✔
98	}	7,394✔
99		7,394✔
100	EditorBuffer getOpenedAndLoadedEditorBuffer(char fileName) {	7,394✔
101	EditorBuffer *buffer = getEditorBufferForFile(fileName);	×
102	if (buffer!=NULL && buffer->textLoaded)
103	return buffer;
104	return NULL;	8,601,647✔
105	}	8,601,647✔
106
107	EditorBuffer findOrCreateAndLoadEditorBufferForFile(char fileName) {	8,601,647✔
108	EditorBuffer *editorBuffer = getEditorBufferForFile(fileName);
109		554,023✔
110	if (editorBuffer != NULL && editorBuffer->textLoaded)
111	/* Found one with text loaded, return it */	8,047,624✔
112	return editorBuffer;
113		8,047,624✔
114	if (editorBuffer == NULL) {	461,827✔
115	/* No buffer found, create one unless it is a directory */
116	if (fileExists(fileName) && !isDirectory(fileName)) {	461,827✔
117	editorBuffer = createNewEditorBuffer(fileName, NULL, fileModificationTime(fileName),
118	fileSize(fileName));	7,585,797✔
119	loadFileIntoEditorBuffer(editorBuffer, fileModificationTime(fileName), fileSize(fileName));
120	} else
121	return NULL;	461,827✔
122	}
123
124	return editorBuffer;
125	}	127✔
126		127✔
127	// Only used from Options for preload	127✔
128	EditorBuffer openEditorBufferFromPreload(char fileName, char *preLoadedFromFile) {	80✔
129	EditorBuffer *buffer = getEditorBufferForFile(fileName);	80✔
130	if (buffer != NULL) {	74✔
131	time_t incomingMtime = fileModificationTime(preLoadedFromFile);	74✔
132	if (incomingMtime == buffer->modificationTime) {	74✔
133	log_debug("Preload '%s': unchanged (mtime %ld), keeping existing buffer", fileName, (long)incomingMtime);
134	buffer->preloadedThisRequest = true;	6✔
135	return buffer;
136	}	6✔
137	log_debug("Preload '%s': content changed (mtime %ld -> %ld), reloading", fileName,	6✔
138	(long)buffer->modificationTime, (long)incomingMtime);	6✔
139	free(buffer->preLoadedFromFile);	6✔
140	buffer->preLoadedFromFile = strdup(normalizeFileName_static(preLoadedFromFile, cwd));	6✔
141	loadFileIntoEditorBuffer(buffer, incomingMtime, fileSize(preLoadedFromFile));
142	buffer->preloadedThisRequest = true;	47✔
143	return buffer;
144	}	47✔
145	buffer = createNewEditorBuffer(fileName, preLoadedFromFile, fileModificationTime(preLoadedFromFile),	47✔
146	fileSize(preLoadedFromFile));
147	buffer->preloadedThisRequest = true;
148	return buffer;	461,880✔
149	}	461,880✔
150
151	char getTextInEditorBuffer(EditorBuffer buffer) {
152	return buffer->allocation.text;	461,886✔
153	}	461,886✔
154
155	size_t getSizeOfEditorBuffer(EditorBuffer *buffer) {
156	return buffer->allocation.bufferSize;	461,880✔
157	}	461,880✔
158		461,880✔
159	void setSizeOfEditorBuffer(EditorBuffer *buffer, size_t size) {
160	buffer->allocation.bufferSize = size;	515✔
161	}	515✔
162		515✔
163	void setEditorBufferModified(EditorBuffer *buffer) {	515✔
164	buffer->modified = true;
165	buffer->modifiedSinceLastQuasiSave = true;	4✔
166	}
167
168	void renameEditorBuffer(EditorBuffer buffer, char newName, EditorUndo **undo) {	4✔
169	char newFileName[MAX_FILE_NAME_SIZE];
170		4✔
171	strcpy(newFileName, normalizeFileName_static(newName, cwd));	4✔
172
173	EditorBuffer *existing_buffer = getEditorBufferForFile(buffer->fileName);	×
174	if (existing_buffer == NULL) {	×
175	char tmpBuffer[TMP_BUFF_SIZE];	×
176	sprintf(tmpBuffer, "Trying to rename non existing buffer %s", buffer->fileName);
177	errorMessage(ERR_INTERNAL, tmpBuffer);
178	return;	4✔
179	}
180	assert(existing_buffer == buffer);	4✔
181		4✔
182	EditorBuffer *deregistered_original = deregisterEditorBuffer(buffer->fileName);
183	assert(deregistered_original == buffer);
184		4✔
185	char *oldName = buffer->fileName;	4✔
186	buffer->fileName = strdup(newFileName);	4✔
187
188	// Update fileNumber	4✔
189	int newFileNumber = addFileNameToFileTable(newFileName);	4✔
190	getFileItemWithFileNumber(newFileNumber)->isArgument = getFileItemWithFileNumber(buffer->fileNumber)->isArgument;	2✔
191	buffer->fileNumber = newFileNumber;	2✔
192
193	EditorBuffer *existing_buffer_with_the_new_name = getEditorBufferForFile(newFileName);	4✔
194	if (existing_buffer_with_the_new_name != NULL) {
195	EditorBuffer *deleted = deregisterEditorBuffer(newFileName);
196	freeEditorBuffer(deleted);	4✔
197	}	3✔
198	registerEditorBuffer(buffer);
199		4✔
200	// note undo operation
201	if (undo!=NULL) {
202	undo = newUndoRename(buffer, oldName, undo);
203	}
204	setEditorBufferModified(buffer);
205		4✔
206	// finally create a buffer with old name and empty text in order	4✔
207	// to keep information that the file is no longer existing	4✔
208	// so old references will be removed on update (fixing problem of	4✔
209	// of moving a package into an existing package).
210	EditorBuffer *removed = createNewEditorBuffer(oldName, NULL, buffer->modificationTime, buffer->size);
211	allocateNewEditorBufferTextSpace(removed, 0);
212	removed->textLoaded = true;
213	setEditorBufferModified(removed);
214	}

thoni56 / c-xrefactory / 1774

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous