From c71983202c5f6e175b05cdde1f8c489fc314f33f Mon Sep 17 00:00:00 2001 From: reynaldo Date: Fri, 30 Jun 2006 04:24:07 +0000 Subject: gets ride of a few more sizeof(char)s git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18862 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 6 +++--- libaf/af_export.c | 2 +- libmenu/menu_console.c | 2 +- loader/ldt_keeper.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/input/input.c b/input/input.c index ffd599b1ce..3a9a3b0922 100644 --- a/input/input.c +++ b/input/input.c @@ -690,7 +690,7 @@ mp_input_parse_cmd(char* str) { ptr2 = e + 1; l--; } - cmd->args[i].v.s = (char*)malloc((l+1)*sizeof(char)); + cmd->args[i].v.s = (char*)malloc(l+1); strncpy(cmd->args[i].v.s,start,l); cmd->args[i].v.s[l] = '\0'; if(term != ' ') ptr += l+2; @@ -746,7 +746,7 @@ mp_input_read_cmd(mp_input_fd_t* mp_fd, char** ret) { // Allocate the buffer if it doesn't exist if(!mp_fd->buffer) { - mp_fd->buffer = (char*)malloc(MP_CMD_MAX_SIZE*sizeof(char)); + mp_fd->buffer = (char*)malloc(MP_CMD_MAX_SIZE); mp_fd->pos = 0; mp_fd->size = MP_CMD_MAX_SIZE; } @@ -802,7 +802,7 @@ mp_input_read_cmd(mp_input_fd_t* mp_fd, char** ret) { // Not dropping : put the cmd in ret if( ! (mp_fd->flags & MP_FD_DROP)) { - (*ret) = (char*)malloc((l+1)*sizeof(char)); + (*ret) = (char*)malloc(l+1); strncpy((*ret),mp_fd->buffer,l); (*ret)[l] = '\0'; } else { // Remove the dropping flag diff --git a/libaf/af_export.c b/libaf/af_export.c index c2eff53476..dd20777c0c 100644 --- a/libaf/af_export.c +++ b/libaf/af_export.c @@ -135,7 +135,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) if(s->filename) free(s->filename); - s->filename = calloc(i + 1, sizeof(char)); + s->filename = calloc(i + 1, 1); memcpy(s->filename, str, i); s->filename[i] = 0; diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c index 1005ee2125..d8d6704b7b 100644 --- a/libmenu/menu_console.c +++ b/libmenu/menu_console.c @@ -467,7 +467,7 @@ static int openMenu(menu_t* menu, char* args) { mpriv->lines = calloc(mpriv->buf_lines,sizeof(char*)); mpriv->prompt = mpriv->mp_prompt; mpriv->cur_history = mpriv->history = calloc(1,sizeof(history_t)); - mpriv->cur_history->buffer = calloc(255,sizeof(char)); + mpriv->cur_history->buffer = calloc(255,1); mpriv->cur_history->size = 255; if(args) diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index 135a1b8dac..5fb612bd2d 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -272,7 +272,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) Setup_FS_Segment(); - ldt_fs->prev_struct = (char*)malloc(sizeof(char) * 8); + ldt_fs->prev_struct = (char*)malloc(8); *(void**)array.base_addr = ldt_fs->prev_struct; return ldt_fs; -- cgit v1.2.3