summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorandmarti1424 <andmarti@gmail.com>2015-08-05 09:50:04 -0300
committerandmarti1424 <andmarti@gmail.com>2015-08-05 09:50:04 -0300
commit1ed5989dfbd473eb7a5417af0f4178ebef634c2b (patch)
tree22d0b1d624b953ba392465e52b20cb696bedbd2e /src
parent9701e9571c291850c603fbb50e2b4d5fccd18111 (diff)
changed error to scerror
Diffstat (limited to 'src')
-rw-r--r--src/vmtbl.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/vmtbl.c b/src/vmtbl.c
index a262ef5..a5acd16 100644
--- a/src/vmtbl.c
+++ b/src/vmtbl.c
@@ -4,7 +4,9 @@
#include "vmtbl.h"
#include "sc.h"
#include "macros.h"
-#include "color.h" // for set_ucolor
+#include "color.h" // for set_ucolor
+#include "conf.h" // for set_ucolor
+#include <stdlib.h> // for atoi
//LINUX - PSC not def
@@ -43,7 +45,7 @@ void checkbounds(int *rowp, int *colp) {
newptr = (type *)scxrealloc((char *)oldptr, \
(unsigned)(nelem * sizeof(type))); \
if (newptr == (type *)NULL) { \
- error(msg); \
+ scerror(msg); \
return (FALSE); \
} \
oldptr = newptr /* wait incase we can't alloc */
@@ -103,7 +105,7 @@ int growtbl(int rowcol, int toprow, int topcol) {
#endif /* !PSC */
if ((rowcol == GROWCOL) || (rowcol == GROWBOTH)) {
if ((rowcol == GROWCOL) && ((maxcols == ABSMAXCOLS) || (topcol >= ABSMAXCOLS))) {
- error(nowider);
+ scerror(nowider);
return (FALSE);
}
@@ -117,7 +119,7 @@ int growtbl(int rowcol, int toprow, int topcol) {
}
if (newrows > MAXROWS) { // 08/12/2014
- error(nolonger);
+ scerror(nolonger);
return (FALSE);
}
@@ -161,7 +163,7 @@ int growtbl(int rowcol, int toprow, int topcol) {
/* [re]alloc the space for each row */
for (i = 0; i < maxrows; i++) {
if ((tbl[i] = (struct ent **) scxrealloc((char *)tbl[i], (unsigned) (newcols * sizeof(struct ent **)))) == (struct ent **)0) {
- error(nowider);
+ scerror(nowider);
return(FALSE);
}
for (nullit = ATBL(tbl, i, maxcols), cnt = 0; cnt < newcols - maxcols; cnt++, nullit++)
@@ -175,7 +177,7 @@ int growtbl(int rowcol, int toprow, int topcol) {
/* fill in the bottom of the table */
for (; i < newrows; i++) {
if ((tbl[i] = (struct ent **) scxmalloc((unsigned)(newcols * sizeof(struct ent **)))) == (struct ent **) 0) {
- error(nowider);
+ scerror(nowider);
return(FALSE);
}
for (nullit = tbl[i], cnt = 0; cnt < newcols; cnt++, nullit++)