summaryrefslogtreecommitdiff
path: root/editors/vi.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-12-19 23:36:04 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-12-19 23:36:04 +0000
commitb95636c52fbb058a39548bcbc4e86456ebbd7b7b (patch)
tree0f82f8e3d225f3bcefdbf7070ae0716f1b309630 /editors/vi.c
parent2375d75f3267e6e4370f221fea485eac8e73d402 (diff)
downloadbusybox-w32-b95636c52fbb058a39548bcbc4e86456ebbd7b7b.tar.gz
busybox-w32-b95636c52fbb058a39548bcbc4e86456ebbd7b7b.tar.bz2
busybox-w32-b95636c52fbb058a39548bcbc4e86456ebbd7b7b.zip
remove casts from xmalloc()
Diffstat (limited to 'editors/vi.c')
-rw-r--r--editors/vi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/vi.c b/editors/vi.c
index 0bb2b23ef..1122f9919 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1370,7 +1370,7 @@ static Byte *new_screen(int ro, int co)
1370 1370
1371 free(screen); 1371 free(screen);
1372 screensize = ro * co + 8; 1372 screensize = ro * co + 8;
1373 screen = (Byte *) xmalloc(screensize); 1373 screen = xmalloc(screensize);
1374 // initialize the new screen. assume this will be a empty file. 1374 // initialize the new screen. assume this will be a empty file.
1375 screen_erase(); 1375 screen_erase();
1376 // non-existent text[] lines start with a tilde (~). 1376 // non-existent text[] lines start with a tilde (~).
@@ -1385,7 +1385,7 @@ static Byte *new_text(int size)
1385 if (size < 10240) 1385 if (size < 10240)
1386 size = 10240; // have a minimum size for new files 1386 size = 10240; // have a minimum size for new files
1387 free(text); 1387 free(text);
1388 text = (Byte *) xmalloc(size + 8); 1388 text = xmalloc(size + 8);
1389 memset(text, '\0', size); // clear new text[] 1389 memset(text, '\0', size); // clear new text[]
1390 //text += 4; // leave some room for "oops" 1390 //text += 4; // leave some room for "oops"
1391 return text; 1391 return text;
@@ -1901,7 +1901,7 @@ static void start_new_cmd_q(Byte c)
1901 // release old cmd 1901 // release old cmd
1902 free(last_modifying_cmd); 1902 free(last_modifying_cmd);
1903 // get buffer for new cmd 1903 // get buffer for new cmd
1904 last_modifying_cmd = (Byte *) xmalloc(BUFSIZ); 1904 last_modifying_cmd = xmalloc(BUFSIZ);
1905 memset(last_modifying_cmd, '\0', BUFSIZ); // clear new cmd queue 1905 memset(last_modifying_cmd, '\0', BUFSIZ); // clear new cmd queue
1906 // if there is a current cmd count put it in the buffer first 1906 // if there is a current cmd count put it in the buffer first
1907 if (cmdcnt > 0) 1907 if (cmdcnt > 0)
@@ -1954,7 +1954,7 @@ static Byte *text_yank(Byte * p, Byte * q, int dest) // copy text into a registe
1954 cnt = q - p + 1; 1954 cnt = q - p + 1;
1955 t = reg[dest]; 1955 t = reg[dest];
1956 free(t); // if already a yank register, free it 1956 free(t); // if already a yank register, free it
1957 t = (Byte *) xmalloc(cnt + 1); // get a new register 1957 t = xmalloc(cnt + 1); // get a new register
1958 memset(t, '\0', cnt + 1); // clear new text[] 1958 memset(t, '\0', cnt + 1); // clear new text[]
1959 strncpy((char *) t, (char *) p, cnt); // copy text[] into bufer 1959 strncpy((char *) t, (char *) p, cnt); // copy text[] into bufer
1960 reg[dest] = t; 1960 reg[dest] = t;