diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/command.c | 10 | ||||
| -rw-r--r-- | src/grkelot.c | 14 | ||||
| -rw-r--r-- | src/options.c | 14 | ||||
| -rw-r--r-- | src/term.c | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/command.c b/src/command.c index 875f41f..6fcd22b 100644 --- a/src/command.c +++ b/src/command.c @@ -2533,13 +2533,13 @@ tt_write(const unsigned char *buf, unsigned int count) * Only use for small ammounts of data. */ void -tt_printf(const unsigned char *fmt,...) +tt_printf(const unsigned char *fmt, ...) { static unsigned char buf[256]; va_list arg_ptr; va_start(arg_ptr, fmt); - vsprintf((char *) buf, (char *) fmt, arg_ptr); + vsnprintf((char *) buf, sizeof(buf), (char *) fmt, arg_ptr); va_end(arg_ptr); tt_write(buf, strlen((char *) buf)); } @@ -2649,7 +2649,7 @@ v_writeBig(int f, char *d, int len) if (v_bufstr == NULL && len > 0) { - v_buffer = malloc(len); + v_buffer = MALLOC(len); v_bufstr = v_buffer; v_bufptr = v_buffer; v_bufend = v_buffer + len; @@ -2679,7 +2679,7 @@ v_writeBig(int f, char *d, int len) /* Don't use XtRealloc because an error is not fatal. */ int size = v_bufptr - v_buffer; /* save across realloc */ - v_buffer = realloc(v_buffer, size + len); + v_buffer = REALLOC(v_buffer, size + len); if (v_buffer) { v_bufstr = v_buffer; v_bufptr = v_buffer + size; @@ -2732,7 +2732,7 @@ v_writeBig(int f, char *d, int len) int size = v_bufptr - v_buffer; int allocsize = size ? size : 1; - v_buffer = realloc(v_buffer, allocsize); + v_buffer = REALLOC(v_buffer, allocsize); if (v_buffer) { v_bufstr = v_buffer + start; v_bufptr = v_buffer + size; diff --git a/src/grkelot.c b/src/grkelot.c index 98d863b..494ea38 100644 --- a/src/grkelot.c +++ b/src/grkelot.c @@ -169,9 +169,9 @@ kstate_end(void) int i; for (i = 0; i < pStateNow->num_xlat; i++) - free(pStateNow->xlat[i].pval); + FREE(pStateNow->xlat[i].pval); if (pStateNow->num_xlat > 0) - free(pStateNow->xlat); + FREE(pStateNow->xlat); } /* @@ -246,22 +246,22 @@ kstate_add_xlat(char *str) return; /* add a new xlat table in state */ if (pStateNow->num_xlat == 0) { - pStateNow->xlat = malloc(sizeof(K_XLAT)); + pStateNow->xlat = MALLOC(sizeof(K_XLAT)); } else /* prefer contiguous data, realloc */ - pStateNow->xlat = realloc(pStateNow->xlat, (pStateNow->num_xlat + 1) * sizeof(K_XLAT)); + pStateNow->xlat = REALLOC(pStateNow->xlat, (pStateNow->num_xlat + 1) * sizeof(K_XLAT)); xlat = &pStateNow->xlat[pStateNow->num_xlat]; /* parse str and derive first, last, values */ xlat->first = (u_int) atoi(strtok(str, "-")); xlat->last = (u_int) atoi(strtok(NULL, ":")); i = 0; - pval_tmp = calloc(MAX_VAL, sizeof(K_XLAT)); + pval_tmp = CALLOC(MAX_VAL, sizeof(K_XLAT)); while ((sval = strtok(NULL, ",")) != NULL) { pval_tmp[i++] = (u_int) (atoi(sval)); } - xlat->pval = calloc(i, sizeof(K_XLAT)); + xlat->pval = CALLOC(i, sizeof(K_XLAT)); if (xlat->pval != NULL) memcpy(xlat->pval, pval_tmp, i * sizeof(u_int)); - free(pval_tmp); + FREE(pval_tmp); pStateNow->num_xlat++; } diff --git a/src/options.c b/src/options.c index 8e976e1..162c2e7 100644 --- a/src/options.c +++ b/src/options.c @@ -955,7 +955,7 @@ get_options(int argc, char *argv[]) register unsigned short k, len = argc - i; - rs_execArgs = (char **) malloc(sizeof(char *) * (argc - i + 1)); + rs_execArgs = (char **) MALLOC(sizeof(char *) * (argc - i + 1)); for (k = 0; k < len; k++) { rs_execArgs[k] = StrDup(argv[k + i]); @@ -967,7 +967,7 @@ get_options(int argc, char *argv[]) register unsigned short k; - rs_execArgs = (char **) malloc(sizeof(char *) * (NumWords(val_ptr) + 1)); + rs_execArgs = (char **) MALLOC(sizeof(char *) * (NumWords(val_ptr) + 1)); for (k = 0; val_ptr; k++) { rs_execArgs[k] = Word(1, val_ptr); @@ -1075,7 +1075,7 @@ get_options(int argc, char *argv[]) k = i + 1; } D_OPTIONS(("len == %d k == %d\n", len, k)); - rs_execArgs = (char **) malloc(sizeof(char *) * len); + rs_execArgs = (char **) MALLOC(sizeof(char *) * len); if (k == i) { rs_execArgs[0] = StrDup((char *) (val_ptr)); @@ -2051,7 +2051,7 @@ parse_keyboard(char *buff) len = 255; /* We can only handle lengths that will fit in a char */ if (len && KeySym_map[sym] == NULL) { - char *p = malloc(len + 1); + char *p = MALLOC(len + 1); *p = len; strncpy(p + 1, str, len); @@ -2209,7 +2209,7 @@ parse_misc(char *buff) Options |= Opt_exec; - RESET_AND_ASSIGN(rs_execArgs, (char **) malloc(sizeof(char *) * ((n = NumWords(PWord(2, buff))) + 1))); + RESET_AND_ASSIGN(rs_execArgs, (char **) MALLOC(sizeof(char *) * ((n = NumWords(PWord(2, buff))) + 1))); for (k = 0; k < n; k++) { rs_execArgs[k] = Word(k + 2, buff); @@ -3417,11 +3417,11 @@ post_parse(void) h = strtol(h1, (char **) NULL, 0); if (w || h) { rs_anim_pixmaps[i] = Word(3, temp); - rs_anim_pixmaps[i] = (char *) realloc(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 9); + rs_anim_pixmaps[i] = (char *) REALLOC(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 9); strcat(rs_anim_pixmaps[i], "@100x100"); } else { rs_anim_pixmaps[i] = Word(3, temp); - rs_anim_pixmaps[i] = (char *) realloc(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 5); + rs_anim_pixmaps[i] = (char *) REALLOC(rs_anim_pixmaps[i], strlen(rs_anim_pixmaps[i]) + 5); strcat(rs_anim_pixmaps[i], "@0x0"); } FREE(temp); @@ -1000,7 +1000,7 @@ process_csi_seq(void) break; #if defined (ENABLE_DISPLAY_ANSWER) case 7: - tt_printf((unsigned char *) "%s\n", display_name); + tt_write((unsigned char *) display_name, strlen(display_name)); break; #endif case 8: @@ -1532,7 +1532,7 @@ set_colorfgbg(void) int fg = -1, bg = -1; if (!colorfgbg_env) { - colorfgbg_env = (char *) malloc(30); + colorfgbg_env = (char *) MALLOC(30); strcpy(colorfgbg_env, "COLORFGBG=default;default;bg"); } for (i = BlackColor; i <= WhiteColor; i++) { |