cadey
/
platypus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up redundant code and mixed measurements

This commit is contained in:
Victor Fernandes 2017-02-13 18:27:32 -05:00
parent 64e0f2d80a
commit 992f82573a
2 changed files with 103 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
buffer.c
View File

@ -206,19 +206,6 @@ short b_getcoffset(Buffer* const pBD) {
return pBD->getc_offset; return pBD->getc_offset;
} }
/* Returns the buffer's actual character buffer address
* Author: Victor Fernandes, 040772243
* Version: 0.0.1
* Called functions: N/A
* Parameters:
- pBuffer const pBD
* Return value: char*, NULL
*/
char* b_cbhead(Buffer* const pBD) {
if (!pBD || !pBD->cb_head) { return NULL; }
return pBD->cb_head;
}
/* Sets a mark offset on the buffer's mark flag and returns a pointer /* Sets a mark offset on the buffer's mark flag and returns a pointer
to cb_head at that offset to cb_head at that offset
* Author: Victor Fernandes, 040772243 * Author: Victor Fernandes, 040772243
@ -278,14 +265,14 @@ pBuffer b_addc(pBuffer const pBD, char symbol) {
pBD->r_flag = UNSET_R_FLAG; pBD->r_flag = UNSET_R_FLAG;
/* BEGIN BUFFER INCREMENT */ /* BEGIN BUFFER INCREMENT */
if (pBD->addc_offset >= pBD->capacity){ if (pBD->addc_offset == pBD->capacity){
if (pBD->mode == FIX_OP_MODE) { /* Fixed mode, won't increment */ if (pBD->mode == FIX_OP_MODE) { /* Fixed mode, won't increment */
return NULL; return NULL;
} }
else if (pBD->mode == ADD_OP_MODE) { /* Calculate new size for additive mode */ else if (pBD->mode == ADD_OP_MODE) { /* Calculate new size for additive mode */
new_cap = pBD->capacity + (unsigned char) pBD->inc_factor; new_cap = pBD->capacity + (unsigned char) pBD->inc_factor;
/* Make sure no short overflow happened */ /* Make sure no short overflow happened */
if (new_cap < MIN_CAPACITY){ if (new_cap < ZERO_CAPACITY){
return NULL; return NULL;
} }
@ -302,7 +289,8 @@ pBuffer b_addc(pBuffer const pBD, char symbol) {
/* Check if there is enough space for the new increment and /* Check if there is enough space for the new increment and
"trim" it if needed*/ "trim" it if needed*/
if (new_inc >= avail_space || (new_inc <= MIN_CAPACITY && pBD->capacity < SHRT_MAX)) { /* Note: If the available space is 1 or 0, new_inc will evaluate to 0 (after truncation) */
if (new_inc == ZERO_CAPACITY) {
new_cap = SHRT_MAX; new_cap = SHRT_MAX;
} }
else { else {
@ -312,7 +300,7 @@ pBuffer b_addc(pBuffer const pBD, char symbol) {
/* Reallocate memory to character buffer */ /* Reallocate memory to character buffer */
old_addr = pBD->cb_head; /* Keep track of old pointer address to check if it changed */ old_addr = pBD->cb_head; /* Keep track of old pointer address to check if it changed */
tmp_addr = (char *)realloc(pBD->cb_head, sizeof(char) * new_cap); tmp_addr = (char *)realloc(pBD->cb_head, sizeof(char) * (unsigned short) new_cap);
if (tmp_addr == NULL){ if (tmp_addr == NULL){
return NULL; /* Abort everything if allocation fails */ return NULL; /* Abort everything if allocation fails */
@ -321,13 +309,12 @@ pBuffer b_addc(pBuffer const pBD, char symbol) {
pBD->cb_head = tmp_addr; pBD->cb_head = tmp_addr;
pBD->capacity = new_cap; pBD->capacity = new_cap;
if (old_addr == pBD->cb_head) { /* Compare the old and new addresses and set flag appropriately */ if (old_addr == pBD->cb_head) { /* Compare the old and new addresses and set flag appropriately */
pBD->r_flag = SET_R_FLAG; pBD->r_flag = (pBD->cb_head == tmp_addr);
} }
} /* END BUFFER INCREASE */ } /* END BUFFER INCREASE */
/* Finally, add new symbol to the buffer after increasing it (or not) */ /* Finally, add new symbol to the buffer after increasing it (or not) */
pBD->cb_head[pBD->addc_offset] = symbol; pBD->cb_head[pBD->addc_offset++] = symbol;
pBD->addc_offset++;
return pBD; return pBD;
} }

1
buffer.h
View File

@ -91,6 +91,5 @@ char b_rflag(Buffer* const);
short b_retract(Buffer* const); short b_retract(Buffer* const);
short b_retract_to_mark(Buffer* const); short b_retract_to_mark(Buffer* const);
short b_getcoffset(Buffer* const); short b_getcoffset(Buffer* const);
char* b_cbhead(Buffer* const);
#endif #endif